diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-21 16:04:57 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-21 16:04:57 -0200 |
| commit | 4d15dbb1ac524a017e9812fb7f21f032ccbc2ae1 (patch) | |
| tree | cdaef97bc80ad29f92490806d29d813a1df209d6 /Makefile.am | |
| parent | edda127130da731e9d314456d89f083a7eeca276 (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 | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 36392d9..fb9b9ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,33 +33,20 @@ xfontsel_SOURCES = \ appman_PRE = \ xfontsel.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/XFontSel -SUFFIXES = .ad - -.ad: - [ -d app-defaults ] || mkdir app-defaults - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh - -CLEANFILES = $(APPDEFAULTFILES) - - appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) SED = sed @@ -80,16 +67,17 @@ 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) < $< > $@ +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 |