summaryrefslogtreecommitdiff
path: root/app/viewres/Makefile.am
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-03-27 11:56:40 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-03-27 11:56:40 +0000
commitb3d743fcef4320c3231a770bc390fe6a58af3c68 (patch)
tree0702f1ffee2423e16bac208b30616a2da27230bb /app/viewres/Makefile.am
parent62ea0a4ee68cb307201badc572889bbe0b2846f6 (diff)
Update to viewres 1.0.2
Diffstat (limited to 'app/viewres/Makefile.am')
-rw-r--r--app/viewres/Makefile.am43
1 files changed, 22 insertions, 21 deletions
diff --git a/app/viewres/Makefile.am b/app/viewres/Makefile.am
index a6e769153..852317523 100644
--- a/app/viewres/Makefile.am
+++ b/app/viewres/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = viewres
-viewres_CFLAGS = $(VIEWRES_CFLAGS)
+AM_CFLAGS = $(VIEWRES_CFLAGS)
viewres_LDADD = $(VIEWRES_LIBS)
viewres_SOURCES = \
@@ -30,32 +30,22 @@ viewres_SOURCES = \
appman_PRE = \
viewres.man
-# App default files (*.ad)
+# App default files
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
-
-APPDEFAULTFILES = \
- Viewres
-
-SUFFIXES = .ad
-
-.ad:
- cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
-
-CLEANFILES = $(APPDEFAULTFILES)
-
+dist_appdefault_DATA = \
+ app-defaults/Viewres \
+ app-defaults/Viewres-color
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+CLEANFILES = $(appman_DATA)
SED = sed
@@ -76,7 +66,18 @@ 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) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL