diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-19 19:42:41 +0000 |
| commit | cdc60fdcddbe5666aac11af34c6c030d4a670b99 (patch) | |
| tree | 4ec58bc0728308be9921485d5e79979bbc65a9b1 /xorg-server/hw/xquartz/bundle/cpprules.in | |
| parent | 800da6ed70c65f5059726b7ce35030e9c7235f01 (diff) | |
| parent | a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 (diff) | |
| download | vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.gz vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.tar.bz2 vcxsrv-cdc60fdcddbe5666aac11af34c6c030d4a670b99.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/bundle/cpprules.in')
| -rw-r--r-- | xorg-server/hw/xquartz/bundle/cpprules.in | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/xorg-server/hw/xquartz/bundle/cpprules.in b/xorg-server/hw/xquartz/bundle/cpprules.in index f32eafc06..92a987d92 100644 --- a/xorg-server/hw/xquartz/bundle/cpprules.in +++ b/xorg-server/hw/xquartz/bundle/cpprules.in @@ -13,25 +13,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ -e '/XSLASHGLOB/s/XSLASHGLOB/\/\*/' \ -e '/\@\@$$/s/\@\@$$/\\/' -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MANDEFS = \ - -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__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \ - -D__xinitdir__=$(XINITDIR) \ - -D__bindir__=$(bindir) \ - -DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp +SUFFIXES = .cpp .cpp: - $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ - -.man.$(APP_MAN_SUFFIX): - $(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@ + $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ |