diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-22 16:05:29 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-22 16:05:29 -0200 |
| commit | f4f59348603fffd2fd3249f272eeeaa72f819b9a (patch) | |
| tree | 7a7e0291a279db000b376c17c4ede4919aaaecaa /Makefile.am | |
| parent | 17bb13a8280da865ecc1be940a8313e65c178a35 (diff) | |
Correct make distcheck and sparse warnings.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index b068461..20543ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,34 +34,21 @@ xmessage_SOURCES = \ appman_PRE = \ xmessage.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/Xmessage \ app-defaults/Xmessage-color -SUFFIXES = .ad - -.ad: - $(mkdir_p) app-defaults - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) Tests - -CLEANFILES = $(APPDEFAULTFILES) - - appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) ChangeLog +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) ChangeLog MAINTAINERCLEANFILES = ChangeLog SED = sed @@ -83,7 +70,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 +78,6 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man .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 |