summaryrefslogtreecommitdiff
path: root/app/ico/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'app/ico/Makefile.am')
-rw-r--r--app/ico/Makefile.am31
1 files changed, 12 insertions, 19 deletions
diff --git a/app/ico/Makefile.am b/app/ico/Makefile.am
index cda69b124..24945d97d 100644
--- a/app/ico/Makefile.am
+++ b/app/ico/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = ico
-ico_CFLAGS = $(ICO_CFLAGS)
+AM_CFLAGS = $(ICO_CFLAGS) $(CWARNFLAGS)
ico_LDADD = $(ICO_LIBS) $(XTHREADLIB) -lm
ico_SOURCES = \
@@ -43,29 +43,22 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
+.PHONY: ChangeLog INSTALL
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
+INSTALL:
+ $(INSTALL_CMD)
-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'
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
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) < $< > $@