summaryrefslogtreecommitdiff
path: root/app/xcalc/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'app/xcalc/Makefile.am')
-rw-r--r--app/xcalc/Makefile.am22
1 files changed, 2 insertions, 20 deletions
diff --git a/app/xcalc/Makefile.am b/app/xcalc/Makefile.am
index 46a0d1ddd..dacb04187 100644
--- a/app/xcalc/Makefile.am
+++ b/app/xcalc/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xcalc
-AM_CFLAGS = $(XCALC_CFLAGS)
+AM_CFLAGS = $(XCALC_CFLAGS) $(CWARNFLAGS)
xcalc_LDADD = $(XCALC_LIBS) -lm
xcalc_SOURCES = \
@@ -63,26 +63,8 @@ EXTRA_DIST = $(appman_PRE) autogen.sh
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):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@