diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 20:01:33 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-13 20:01:33 -0200 |
| commit | 6648b49e4fb8461975eff8002e4c84f04b698a5e (patch) | |
| tree | f820fa4c6c7e3a6f35bc2755437b145262b492cb /Makefile.am | |
| parent | 712cd2c1909dd7a10a5ca98d48605d170321c025 (diff) | |
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
make distcheck.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index b642131..477bdc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,30 +31,21 @@ beforelight_SOURCES = \ appman_PRE = \ beforelight.man -# App default files (*.ad) +# App default files -EXTRA_DIST = \ - app-defaults/Beforelight.ad +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults -APPDEFAULTFILES = \ - app-defaults/Beforelight - -SUFFIXES = .ad - -.ad: - $(mkdir_p) app-defaults - cp $< $@ +appdefaultdir = @appdefaultdir@ -appdefault_DATA = $(APPDEFAULTFILES) - -CLEANFILES = $(APPDEFAULTFILES) +dist_appdefault_DATA = \ + app-defaults/Beforelight 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 @@ -75,7 +66,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) < $< > $@ @@ -86,6 +77,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 |