2000-03-11 00:20:34 +00:00
|
|
|
--- config/cf/Imake.tmpl~ Tue Feb 22 02:42:26 2000
|
|
|
|
+++ config/cf/Imake.tmpl Tue Feb 22 03:11:21 2000
|
|
|
|
@@ -1282,7 +1282,7 @@
|
|
|
|
CXXOPTIONS = CplusplusOptions
|
|
|
|
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
|
|
|
|
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
|
|
|
|
- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
|
|
|
|
+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
|
|
|
|
#endif
|
|
|
|
COMPRESS = CompressCmd
|
|
|
|
GZIPCMD = GzipCmd
|
|
|
|
@@ -1469,7 +1469,7 @@
|
|
|
|
*/
|
|
|
|
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
|
|
|
|
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
|
|
|
|
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
|
|
|
|
+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
|
|
|
|
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
|
|
|
|
LDPRELIB = LdPreLib
|
|
|
|
LDPOSTLIB = LdPostLib
|