From 198ac897c7136425a20011a6c99f80cb925d622b Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Fri, 6 Aug 2010 12:32:10 -0400 Subject: man: using the C preprocessor is not required for man pages. There were no special symbols needing cpp. Everything can be handled by the default MAN_SUBSTS in util-macros. Signed-off-by: Gaetan Nadon --- man/Makefile.am | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) (limited to 'man') diff --git a/man/Makefile.am b/man/Makefile.am index 140648e..8e8ed9a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -118,46 +118,11 @@ EXTRA_DIST = $(libman_PRE) CLEANFILES = $(libman_DATA) -# Rules for generating files using the C pre-processor -# (Replaces CppFileTarget from Imake) - -SED = sed - SUFFIXES = .$(LIB_MAN_SUFFIX) .man -# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM -# to cpp, because that trick does not work on all ANSI C preprocessors. -# Delete line numbers from the cpp output (-P is not portable, I guess). -# Allow XCOMM to be preceded by whitespace and provide a means of generating -# output lines with trailing backslashes. -# Allow XHASH to always be substituted, even in cases where XCOMM isn't. - -CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ - -e '/^\#line *[0-9][0-9]* *.*$$/d' \ - -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ - -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ - -e '/^[ ]*XHASH/s/XHASH/\#/' \ - -e '/\@\@$$/s/\@\@$$/\\/' - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - XSERVERNAME = Xorg - -MANDEFS = \ - -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ - -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \ - -D__appmansuffix__=$(APP_MAN_SUFFIX) \ - -D__filemansuffix__=$(FILE_MAN_SUFFIX) \ - -D__libmansuffix__=$(LIB_MAN_SUFFIX) \ - -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ - -D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \ - -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \ - -D__projectroot__=$(prefix) - +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ - + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Generate man page shadow files (Replaces InstallManPageAliases from Imake) -- cgit v1.2.1