summaryrefslogtreecommitdiff
path: root/app/xman/Makefile.am
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-10-24 15:00:52 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-10-24 15:00:52 +0000
commita347ddc5148ab2f95f2f409a90aced0e48b36c37 (patch)
treec51e1ba2f526f8c4475cd4bc71b6c02a16c42b42 /app/xman/Makefile.am
parentcbeaaf916a38c4fd3b33423c67b54995f8a000e5 (diff)
Update to xman 1.1.0
Diffstat (limited to 'app/xman/Makefile.am')
-rw-r--r--app/xman/Makefile.am43
1 files changed, 19 insertions, 24 deletions
diff --git a/app/xman/Makefile.am b/app/xman/Makefile.am
index 1b4de74d4..91ffb8128 100644
--- a/app/xman/Makefile.am
+++ b/app/xman/Makefile.am
@@ -24,7 +24,8 @@ bin_PROGRAMS = xman
helpdir=@HELPDIR@
dist_help_DATA = xman.help
-xman_CFLAGS = $(XMAN_CFLAGS) -D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
+AM_CFLAGS = $(CWARNFLAGS) $(XMAN_CFLAGS) \
+ -D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\"
xman_LDADD = $(XMAN_LIBS)
xman_SOURCES = \
@@ -50,39 +51,23 @@ xman_SOURCES = \
vendor.h \
version.h
-if XAW_USE_XPRINT
-xman_SOURCES += \
- print.c \
- print.h
-endif
-
appman_PRE = \
xman.man
-# App default files (*.ad)
-
-appdefaultdir = @appdefaultdir@
+# App default files
-if XAW_USE_XPRINT
-Xman: Xman-xprint.ad
- ln -s $(top_srcdir)/Xman-xprint.ad Xman
-else
-Xman: Xman-noxprint.ad
- ln -s $(top_srcdir)/Xman-noxprint.ad Xman
-endif
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
-appdefault_DATA = Xman
-
-EXTRA_DIST = Xman-xprint.ad Xman-noxprint.ad
+appdefaultdir = @appdefaultdir@
-CLEANFILES = Xman
+dist_appdefault_DATA = app-defaults/Xman
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
@@ -106,4 +91,14 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog