diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 16:26:42 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 16:26:42 -0200 |
| commit | 82d76c4efcae92709aa07ec9e653f73076f43ebf (patch) | |
| tree | f2e47733c95115ff34c0d0adf82b80c6d6f93316 /Makefile.am | |
| parent | 48663cb8af72ea5e0528a341a7dc8865aa84fad2 (diff) | |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 67faa6e..21c3685 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,24 +35,16 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = @appdefaultdir@ +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults +appdefaultdir = @appdefaultdir@ -APPDEFAULTFILES = \ +dist_appdefault_DATA = \ app-defaults/XClock-color \ app-defaults/XClock -SUFFIXES = .ad - -.ad: - [ -d app-defaults ] || mkdir app-defaults - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - EXTRA_DIST = \ ChangeLog \ - $(APPDEFAULTFILES:%=%.ad) \ clmask.bit \ clock.bit @@ -70,7 +62,7 @@ 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 @@ -93,7 +85,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) < $< > $@ |