summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 15:31:58 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-22 15:31:58 -0200
commit68bad5a59d3619372cb4a48563f5c7423f54163d (patch)
treebc696dea3970df6fd4bf37b5e9d17f4351ad667d /Makefile.am
parent0436471fd8007826d40a2f57710e9964c0768d50 (diff)
Correct make distcheck and sparse warnings.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am25
1 files changed, 7 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index 963abbe..70e8fc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,33 +33,22 @@ xload_SOURCES = \
appman_PRE = \
xload.man
-# App default files (*.ad)
+# App default files
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
-
-APPDEFAULTFILES = \
+dist_appdefault_DATA = \
app-defaults/XLoad
-SUFFIXES = .ad
-
-.ad:
- [ -d app-defaults ] || mkdir app-defaults
- cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) xload.bit
-
-CLEANFILES = $(APPDEFAULTFILES)
-
+EXTRA_DIST = xload.bit
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES = $(appman_DATA)
SED = sed
@@ -80,7 +69,7 @@ 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) < $< > $@
@@ -91,6 +80,6 @@ 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