diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-07-21 07:31:09 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-07-21 07:31:09 +0000 |
| commit | 8a1bd001223ac0fc23cb139d64ae23ee44e5245d (patch) | |
| tree | 9e62fbcde9b6b1949689cf62a9f395d2f6b34558 | |
| parent | 88cc5952b8c9d4815665e160e3ef17f25ef65e3a (diff) | |
Remove the VENDOR_DEFINES from ALLDEFINES, as the quoting on VENDOR_DEFINES
was breaking some old imake software, and it really doesn't seem like
an appropriate define for all imake-using software. Instead, add it to
the DEFINES of those pieces that need it.
| -rw-r--r-- | Imake.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.3 2004/05/24 19:06:57 eich Exp $ +XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.4 2004/06/26 16:26:18 ago Exp $ XCOMM XCOMM XCOMM @@ -2034,7 +2034,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib $(INSTALLED_LIBS) |