summaryrefslogtreecommitdiff
path: root/app/xmag/Makefile.am
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-09-26 14:49:37 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-09-26 14:49:37 +0000
commit546cf947d181edf627c2d1f9821e718c103d8cbe (patch)
treee6a7fd9036583427a09eae096408a4be846a69d2 /app/xmag/Makefile.am
parent8f53c3ed0c8e06999a24e0f03956e7d8e5ffcc0f (diff)
update to xmag 1.0.3
Diffstat (limited to 'app/xmag/Makefile.am')
-rw-r--r--app/xmag/Makefile.am36
1 files changed, 18 insertions, 18 deletions
diff --git a/app/xmag/Makefile.am b/app/xmag/Makefile.am
index b2a1bfda9..39de39ec6 100644
--- a/app/xmag/Makefile.am
+++ b/app/xmag/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xmag
-xmag_CFLAGS = $(XMAG_CFLAGS)
+AM_CFLAGS = $(XMAG_CFLAGS)
xmag_LDADD = $(XMAG_LIBS) -lm
xmag_SOURCES = \
@@ -40,25 +40,15 @@ appman_PRE = \
# App default files (*.ad)
-appdefaultdir = @appdefaultdir@
-
-
-APPDEFAULTFILES = \
- Xmag
-
-SUFFIXES = .ad
-
-.ad:
- cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
+appdefaultdir = @appdefaultdir@
-CLEANFILES = $(APPDEFAULTFILES)
+dist_appdefault_DATA = \
+ app-defaults/Xmag
# Developer documentation for Scale widget in Scale.c
-EXTRA_DIST += Scale.txt
+EXTRA_DIST = Scale.txt
EXTRA_DIST += xmag.icon
@@ -67,7 +57,7 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES = $(appman_DATA)
SED = sed
@@ -88,7 +78,17 @@ 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) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog