From cc164f02081e0087dfc3959bc095ed3c307d8e0a Mon Sep 17 00:00:00 2001
From: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Mon, 10 Nov 2008 20:12:14 +0100
Subject: [PATCH] enable VPATH build, reorganize app default files

---
 Makefile.am         |   20 +++++---------------
 app-defaults/Xfd    |   40 ++++++++++++++++++++++++++++++++++++++++
 app-defaults/Xfd.ad |   40 ----------------------------------------
 3 files changed, 45 insertions(+), 55 deletions(-)
 create mode 100644 app-defaults/Xfd
 delete mode 100644 app-defaults/Xfd.ad

diff --git a/Makefile.am b/Makefile.am
index e07348d..dbfbeb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,31 +33,21 @@ xfd_SOURCES =	\
 appman_PRE = \
         xfd.man
 
-# App default files  (*.ad)
+# App default files
 
 appdefaultdir = @appdefaultdir@
 
-APPDEFAULTFILES = \
+dist_appdefault_DATA = \
         app-defaults/Xfd
 
-SUFFIXES = .ad
-
-.ad:
-	cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
-
-CLEANFILES = $(APPDEFAULTFILES)
 
 
 appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
 
 SED = sed
 
@@ -78,7 +68,7 @@ MAN_SUBSTS = \
 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
diff --git a/app-defaults/Xfd b/app-defaults/Xfd
new file mode 100644
index 0000000..29ff522
--- /dev/null
+++ b/app-defaults/Xfd
@@ -0,0 +1,40 @@
+! $Xorg: Xfd.ad,v 1.3 2000/08/17 19:54:18 cpqbld Exp $
+
+
+
+! $XFree86$
+
+*internalBorderWidth: 0
+*showGrip: false
+
+*grid.borderWidth: 0
+
+*quit.Label: Quit
+*prev.Label: Prev
+*next.Label: Next
+*prev16.Label: -16
+*next16.Label: +16
+
+*select.Label: Select a character
+*metrics.Label: 
+*select.Justify: center
+*metrics.Justify: center
+*range.Justify: left
+*start.Justify: left
+
+*quit.Translations:  #override \
+		<Btn1Down>,<Btn1Up>: Quit() unset()
+*next16.Translations:  #override \
+		<Btn1Down>,<Btn1Up>: Next16() unset()
+*next.Translations:  #override \
+		<Btn1Down>,<Btn1Up>: Next() unset()
+*prev.Translations:  #override \
+		<Btn1Down>,<Btn1Up>: Prev() unset()
+*prev16.Translations:  #override \
+		<Btn1Down>,<Btn1Up>: Prev16() unset()
+
+*Translations: #override \n\
+<Key>q: Quit()\n\
+Ctrl <Key>n: Next()\n\
+Ctrl <Key>p: Prev()
+
diff --git a/app-defaults/Xfd.ad b/app-defaults/Xfd.ad
deleted file mode 100644
index 29ff522..0000000
--- a/app-defaults/Xfd.ad
+++ /dev/null
@@ -1,40 +0,0 @@
-! $Xorg: Xfd.ad,v 1.3 2000/08/17 19:54:18 cpqbld Exp $
-
-
-
-! $XFree86$
-
-*internalBorderWidth: 0
-*showGrip: false
-
-*grid.borderWidth: 0
-
-*quit.Label: Quit
-*prev.Label: Prev
-*next.Label: Next
-*prev16.Label: -16
-*next16.Label: +16
-
-*select.Label: Select a character
-*metrics.Label: 
-*select.Justify: center
-*metrics.Justify: center
-*range.Justify: left
-*start.Justify: left
-
-*quit.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Quit() unset()
-*next16.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Next16() unset()
-*next.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Next() unset()
-*prev.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Prev() unset()
-*prev16.Translations:  #override \
-		<Btn1Down>,<Btn1Up>: Prev16() unset()
-
-*Translations: #override \n\
-<Key>q: Quit()\n\
-Ctrl <Key>n: Next()\n\
-Ctrl <Key>p: Prev()
-
-- 
1.6.0.3