diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 17:53:19 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 17:53:19 +0000 |
| commit | 1881cadba2617af259919baed27105a7f56f5552 (patch) | |
| tree | 00eb5aae6b0072b4cb3b569ffc5db78a736e6b5a /app/fstobdf/Makefile.am | |
| parent | 0241d7ae53becbcbee2a92d39eb4dd725e95fd52 (diff) | |
Update to fstobdf 1.0.4. No functional change.
Diffstat (limited to 'app/fstobdf/Makefile.am')
| -rw-r--r-- | app/fstobdf/Makefile.am | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/app/fstobdf/Makefile.am b/app/fstobdf/Makefile.am index d543e7428..ab0eb99d7 100644 --- a/app/fstobdf/Makefile.am +++ b/app/fstobdf/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = fstobdf -AM_CFLAGS = $(FSTOBDF_CFLAGS) +AM_CFLAGS = $(FSTOBDF_CFLAGS) $(CWARNFLAGS) fstobdf_LDADD = $(FSTOBDF_LIBS) fstobdf_SOURCES = \ @@ -40,38 +40,22 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) +MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(appman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - SUFFIXES = .$(APP_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + -EXTRA_DIST += ChangeLog -MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) 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 +dist-hook: ChangeLog INSTALL |