Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split OS_CFLAGS into OS_CFLAGS, OS_INCLUDES and DEFINES.

Browse Source 
Modified Makefile.ins to append not overwrite DEFINES.
Added $(DEFINES) to the mkdepend command line so that some conditional dependencies are caught as well.
This commit is contained in:
cls%seawood.org 1998-10-25 22:25:25 +00:00
parent 9515c34572
commit 2949f638d8
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/public/Makefile.in
View File

@ -22,7 +22,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES = -D_IMPL_NS_BASE
DEFINES += -D_IMPL_NS_BASE
EXPORTS = \
nsISizeOfHandler.h \

2
base/src/Makefile.in
View File

@ -22,7 +22,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DEFINES =-D_IMPL_NS_BASE
DEFINES +=-D_IMPL_NS_BASE
ifeq ($(OS_TARGET),Rhapsody)
DIRS = rhapsody

2
base/src/rhapsody/Makefile.in
View File

@ -29,7 +29,7 @@ MODULE=raptor
REQUIRES=xpcom raptor
DEFINES = -D_IMPL_NS_WIDGET
DEFINES += -D_IMPL_NS_WIDGET
CPPSRCS= \
nsTimer.cpp

2
base/src/unix/Makefile.in
View File

@ -29,7 +29,7 @@ MODULE=raptor
REQUIRES=xpcom raptor
DEFINES = -D_IMPL_NS_WIDGET
DEFINES += -D_IMPL_NS_WIDGET
CPPSRCS= \
nsTimer.cpp

4
config/autoconf.mk.in
View File

@ -50,8 +50,10 @@ MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
MOZ_NATIVE_PNG = @SYSTEM_PNG@
# Should the extra CFLAGS only be added in Makefile.ins that need them?
OS_CFLAGS = @CFLAGS@ @DEFS@ $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
OS_CFLAGS = @CFLAGS@
OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
OS_LIBS = @LDFLAGS@ @LIBS@
DEFINES = @DEFS@
XCFLAGS = @XCFLAGS@
XLDFLAGS = @XLDFLAGS@

4
config/config.mk
View File

@ -225,7 +225,7 @@ endif
ifdef USE_AUTOCONF
OPTIMIZER =
DEFINES = -UDEBUG -DNDEBUG -DTRIMMED
DEFINES += -UDEBUG -DNDEBUG -DTRIMMED
XBCFLAGS =
else
@ -285,7 +285,7 @@ else
OPTIMIZER = -g
endif
JAVA_OPTIMIZER = -g
DEFINES = -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell $(WHOAMI)) -DTRACING
XBCFLAGS = -FR$*
endif

4
config/rules.mk
View File

@ -779,10 +779,10 @@ $(MKDEPENDENCIES)::
@$(MAKE_OBJDIR)
touch $(MKDEPENDENCIES)
ifdef USE_AUTOCONF
$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS))
$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(INCLUDES) $(addprefix $(srcdir)/,$(CSRCS) $(CPPSRCS))
@mv depend.mk depend.mk.old && cat depend.mk.old | sed "s|^$(OBJDIR_NAME)/$(srcdir)/|$(OBJDIR_NAME)/|g" > depend.mk && rm -f depend.mk.old
else
$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(INCLUDES) $(CSRCS) $(CPPSRCS)
$(MKDEPEND) -p$(OBJDIR_NAME)/ -o'.o' -f$(MKDEPENDENCIES) $(DEFINES) $(INCLUDES) $(CSRCS) $(CPPSRCS)
endif
$(MKDEPEND)::