summaryrefslogtreecommitdiff
path: root/app/xrdb/Makefile.am
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-10-24 15:15:12 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-10-24 15:15:12 +0000
commit5c745e77a0ed4478b2a53f195914bcf2afc63c11 (patch)
treeee13b209c91ac26179329629b201c8c492b45ace /app/xrdb/Makefile.am
parent30d8d367bb6977fc985e93c1b2d9e6fc29d2bb5c (diff)
Update to xrdb 1.0.6
Diffstat (limited to 'app/xrdb/Makefile.am')
-rw-r--r--app/xrdb/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/xrdb/Makefile.am b/app/xrdb/Makefile.am
index a4e93ed14..6c35a9b3c 100644
--- a/app/xrdb/Makefile.am
+++ b/app/xrdb/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xrdb
-AM_CFLAGS = $(XRDB_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS)
xrdb_LDADD = $(XRDB_LIBS)
xrdb_SOURCES = \
@@ -34,14 +34,14 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
@@ -67,4 +67,4 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@