diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-12 18:53:19 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-12 18:53:19 -0200 |
| commit | 11e13bdf2bdc6cdc7f7d27427016eaf8c9ad48c3 (patch) | |
| tree | 36961b4b43bcb098d72a983e655971f019118791 /Makefile.am | |
| parent | 8509d5cc01607e19590571b4e0d941b0e5900052 (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 | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 399d71b..4281007 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = oclock -oclock_CFLAGS = $(OCLOCK_CFLAGS) +AM_CFLAGS = $(OCLOCK_CFLAGS) oclock_LDADD = $(OCLOCK_LIBS) -lm oclock_SOURCES = \ @@ -37,30 +37,21 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = @appdefaultdir@ - - -APPDEFAULTFILES = \ - Clock-color - -SUFFIXES = .ad +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults -.ad: - cp $< $@ - -appdefault_DATA = $(APPDEFAULTFILES) - -EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) oclock.bit oclmask.bit +appdefaultdir = @appdefaultdir@ -CLEANFILES = $(APPDEFAULTFILES) +dist_appdefault_DATA = \ + app-defaults/Clock-color +EXTRA_DIST = oclock.bit oclmask.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 @@ -81,7 +72,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) < $< > $@ @@ -92,6 +83,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 |