[PATCH app-xdm 05/11] config: remove copying Chooser.ad to Chooser
Gaetan Nadon
memsize at videotron.ca
Sun Aug 29 06:24:46 PDT 2010
This was removed from all other apps with resources in app-defaults.
The Chooser resource file is a file in git that gets installed
and distributed.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
Makefile.am | 19 ++--------------
app-defaults/.gitignore | 2 -
app-defaults/Chooser | 51 +++++++++++++++++++++++++++++++++++++++++++++++
app-defaults/Chooser.ad | 51 -----------------------------------------------
4 files changed, 54 insertions(+), 69 deletions(-)
delete mode 100644 app-defaults/.gitignore
create mode 100644 app-defaults/Chooser
delete mode 100644 app-defaults/Chooser.ad
diff --git a/Makefile.am b/Makefile.am
index b226282..341e65a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,25 +155,12 @@ chooser_LDADD = $(CHOOSER_LIBS)
chooser_SOURCES = \
chooser.c
-# App default files (*.ad)
+# App default files
+# This ensures distcheck is performed in a location where user has write access
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
-appdefaultdir = @appdefaultdir@
-
-APPDEFAULTFILES = app-defaults/Chooser
-
-SUFFIXES += .ad
-
-.ad:
- [ -d app-defaults ] || mkdir app-defaults
- cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-CLEANFILES += $(APPDEFAULTFILES)
-
-EXTRA_DIST += $(APPDEFAULTFILES:%=%.ad)
+dist_appdefault_DATA = app-defaults/Chooser
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
diff --git a/app-defaults/.gitignore b/app-defaults/.gitignore
deleted file mode 100644
index 64eab90..0000000
--- a/app-defaults/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add & Override for this directory and it's subdirectories
-Chooser
diff --git a/app-defaults/Chooser b/app-defaults/Chooser
new file mode 100644
index 0000000..2e1eaf1
--- /dev/null
+++ b/app-defaults/Chooser
@@ -0,0 +1,51 @@
+! XDM chooser application defaults
+!
+*ShapeStyle: Oval
+*cursor: left_ptr
+*allowShellResize: true
+*label.label: XDMCP Host Menu
+*label.borderWidth: 0
+*label.skipAdjust: true
+*paned*showGrip: false
+!*viewport.horizDistance: 20
+!*viewport.height: 200
+*viewport.width: 400
+*viewport.height: 50
+*viewport.allowVert: true
+*viewport.fromVert: label
+*viewport.resizeable: true
+*viewport.allowResize: true
+
+*list.translations: #override \
+ <Key>Return: Accept() \n\
+ <Key>: KeySwitch() \n\
+ <Btn1Down>: Store() Set() CheckWilling() Setold() \n\
+ <Btn1Up>(2): Accept() \n\
+ <Btn4Down>: BtnSwitch() \n\
+ <Btn5Down>: BtnSwitch()
+
+*list.defaultColumns: 1
+*list.forceColumns: true
+
+*box.skipAdjust: true
+*cancel.fromHoriz: viewport
+*cancel.fromVert: label
+*cancel.vertDistance: 100
+*cancel.bottom: ChainBottom
+*cancel.top: ChainBottom
+*cancel.left: ChainRight
+*cancel.right: ChainRight
+
+*accept.fromHoriz: viewport
+*accept.fromVert: cancel
+*accept.bottom: ChainBottom
+*accept.top: ChainBottom
+*accept.left: ChainRight
+*accept.right: ChainRight
+
+*cancel.translations: #override \
+ <BtnUp>: Cancel() unset()
+*accept.translations: #override \
+ <BtnUp>: Accept() unset()
+*ping.translations: #override \
+ <BtnUp>: Ping() unset()
diff --git a/app-defaults/Chooser.ad b/app-defaults/Chooser.ad
deleted file mode 100644
index 2e1eaf1..0000000
--- a/app-defaults/Chooser.ad
+++ /dev/null
@@ -1,51 +0,0 @@
-! XDM chooser application defaults
-!
-*ShapeStyle: Oval
-*cursor: left_ptr
-*allowShellResize: true
-*label.label: XDMCP Host Menu
-*label.borderWidth: 0
-*label.skipAdjust: true
-*paned*showGrip: false
-!*viewport.horizDistance: 20
-!*viewport.height: 200
-*viewport.width: 400
-*viewport.height: 50
-*viewport.allowVert: true
-*viewport.fromVert: label
-*viewport.resizeable: true
-*viewport.allowResize: true
-
-*list.translations: #override \
- <Key>Return: Accept() \n\
- <Key>: KeySwitch() \n\
- <Btn1Down>: Store() Set() CheckWilling() Setold() \n\
- <Btn1Up>(2): Accept() \n\
- <Btn4Down>: BtnSwitch() \n\
- <Btn5Down>: BtnSwitch()
-
-*list.defaultColumns: 1
-*list.forceColumns: true
-
-*box.skipAdjust: true
-*cancel.fromHoriz: viewport
-*cancel.fromVert: label
-*cancel.vertDistance: 100
-*cancel.bottom: ChainBottom
-*cancel.top: ChainBottom
-*cancel.left: ChainRight
-*cancel.right: ChainRight
-
-*accept.fromHoriz: viewport
-*accept.fromVert: cancel
-*accept.bottom: ChainBottom
-*accept.top: ChainBottom
-*accept.left: ChainRight
-*accept.right: ChainRight
-
-*cancel.translations: #override \
- <BtnUp>: Cancel() unset()
-*accept.translations: #override \
- <BtnUp>: Accept() unset()
-*ping.translations: #override \
- <BtnUp>: Ping() unset()
--
1.6.0.4
More information about the xorg-devel
mailing list