From 722c2daca94fd2c88c4021c54bc1568957404f43 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 10 Nov 2008 20:08:37 +0100 Subject: [PATCH] enable VPATH build, reorganize app default files --- Makefile.am | 19 +++++-------------- app-defaults/Xgc | 2 ++ app-defaults/Xgc.ad | 2 -- 3 files changed, 7 insertions(+), 16 deletions(-) create mode 100644 app-defaults/Xgc delete mode 100644 app-defaults/Xgc.ad diff --git a/Makefile.am b/Makefile.am index 213c499..4601ca0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,22 +51,15 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES) gram.h: gram.c -# App default files (*.ad) +# App default files appdefaultdir = @appdefaultdir@ - -APPDEFAULTFILES = \ +dist_appdefault_DATA = \ app-defaults/Xgc -SUFFIXES = .ad - -.ad: - cp $< $@ -appdefault_DATA = $(APPDEFAULTFILES) - -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) tile Bugs \ +EXTRA_DIST = tile Bugs \ Written/FilledRects \ Written/Interface \ Written/Jim \ @@ -75,15 +68,13 @@ EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) tile Bugs \ Written/Outline \ Written/Widget -CLEANFILES = $(APPDEFAULTFILES) - appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +CLEANFILES = $(appman_DATA) SED = sed @@ -104,7 +95,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/Xgc b/app-defaults/Xgc new file mode 100644 index 0000000..7695abb --- /dev/null +++ b/app-defaults/Xgc @@ -0,0 +1,2 @@ +*planemask*ShapeStyle: rectangle +*dashlist*ShapeStyle: rectangle diff --git a/app-defaults/Xgc.ad b/app-defaults/Xgc.ad deleted file mode 100644 index 7695abb..0000000 --- a/app-defaults/Xgc.ad +++ /dev/null @@ -1,2 +0,0 @@ -*planemask*ShapeStyle: rectangle -*dashlist*ShapeStyle: rectangle -- 1.6.0.3