Pull CFLAGS out of link line.

This commit is contained in:
slamm%netscape.com 1999-03-22 20:43:02 +00:00
parent b6c9516763
commit 3741dc0c83
2 changed files with 6 additions and 1 deletions

View File

@ -71,8 +71,10 @@ OS_CXXFLAGS = @CXXFLAGS@
OS_CFLAGS += $(DSO_CFLAGS)
OS_CXXFLAGS += $(DSO_CFLAGS)
OS_LDFLAGS = @LDFLAGS@
OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
OS_LIBS = @LDFLAGS@ @LIBS@
OS_LIBS = @LIBS@
ACDEFINES = @DEFS@
XCFLAGS = @XCFLAGS@
@ -168,6 +170,7 @@ MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
LIBS_PATH = @LIBS_PATH@
COMPILER_DEPEND = @COMPILER_DEPEND@
MDDEPDIR := @MDDEPDIR@
# Pulled these out of configure.in,
# so undefine them now instead of subst

View File

@ -359,6 +359,8 @@ CXXFLAGS = $(XP_DEFINE) $(OPTIMIZER) $(OS_CXXFLAGS) $(MDUPDATE_FLAGS) $(DEFINES)
NOMD_CFLAGS = $(XP_DEFINE) $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
NOMD_CXXFLAGS = $(XP_DEFINE) $(OPTIMIZER) $(OS_CXXFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
LDFLAGS = $(OS_CFLAGS)
#
# Include the binary distrib stuff, if necessary.
#