summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-12-17 19:19:03 -0800
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-12-17 19:19:03 -0800
commit03f6a08c503ff12e2457a9ccc13bfbb801e2161d (patch)
tree2708a6c6fad46de6fdce5581eba9f2341638b900 /Makefile.am
parent0ca983a6bac03489fb0d2ad158114a811eb276a2 (diff)
Use XORG_CWARNFLAGS & XORG_CHANGELOG from xorg-macros 1.2
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am7
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 213031d..ce7a262 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = mkfontscale
-mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+AM_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE $(CWARNFLAGS)
mkfontscale_LDADD = @MKFONTSCALE_LIBS@
mkfontscale_SOURCES = \
@@ -67,12 +67,9 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-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