Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move defines from Makefile control to autoconf control.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@20795 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
slamm%netscape.com 1999-02-16 18:29:55 +00:00
parent ab37511cae
commit f59cd2ba61
2 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/config/autoconf.mk.in
View File

@ -39,12 +39,13 @@ NO_NETSCAPE_SHARED = @NO_SHARED_LIB@
NO_STATIC_LIB = @NO_STATIC_LIB@
NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
ENABLE_TESTS = @ENABLE_TESTS@
MOZ_USER_DIR = @MOZ_USER_DIR@
SMART_MAIL = @MOZ_SMART_MAIL@
DOM = @MOZ_DOM@
MOZ_MAIL_COMPOSE = @MOZ_MAIL_COMPOSE@
NO_UNIX_LDAP = @NO_UNIX_LDAP@
BUILD_IDL_TOOL = @MOZ_IDL_TOOL@
MODULAR_NETLIB = @MODULAR_NETLIB@
STANDALONE_IMAGE_LIB = @STANDALONE_IMAGE_LIB@
MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
@ -60,7 +61,7 @@ AC_DEFINES = @DEFS@
USE_CPP_INCLUDE_FLAG = @USE_CPP_INCLUDE_FLAG@
ifdef USE_CPP_INCLUDE_FLAG
AC_INCLUDE_OR_DEFINES = -include @CONFIG_DEFS_H@
AC_INCLUDE_OR_DEFINES := -include @CONFIG_DEFS_H@
else
AC_INCLUDE_OR_DEFINES := $(AC_DEFINES)
endif
@ -144,9 +145,6 @@ MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
NGLAYOUT_PLUGINS=1
CM_BLDTYPE=dbg
AWT_11=1
MODULAR_NETLIB=1
MOZ_BITS=32
MOZ_GOLD=1
OS_TARGET=@OS_TARGET@
STANDALONE_IMAGE_LIB=1

56
mozilla/config/config.mk
View File

@ -203,7 +203,6 @@ SEMICOLON := ;$(EMPTY)
SPACE := $(EMPTY) $(EMPTY)
PATH_SEPARATOR := \;
RC = flipper rc$(BIN_SUFFIX)
XP_DEFINE = -DXP_PC
LIB_SUFFIX = lib
DLL_SUFFIX = dll
MAP_SUFFIX = map
@ -220,7 +219,6 @@ else
ifeq ($(OS_ARCH),WINNT)
PATH_SEPARATOR := :
RC = rc$(BIN_SUFFIX)
XP_DEFINE = -DXP_PC
LIB_SUFFIX = lib
DLL_SUFFIX = dll
BIN_SUFFIX = .exe
@ -232,7 +230,6 @@ INSTALL = $(NSINSTALL)
JAVA_PROG = java
else
PATH_SEPARATOR := :
XP_DEFINE = -DXP_UNIX
AR = ar cr $@
ifndef USE_AUTOCONF
DLL_SUFFIX = so
@ -476,7 +473,7 @@ endif
######################################################################
# Now test variables that might have been set or overridden by $(MY_CONFIG).
DEFINES += -DNETSCAPE -DOSTYPE=\"$(OS_CONFIG)\"
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
# Specify that we are building a client.
# This will instruct the cross platform libraries to
@ -490,11 +487,6 @@ STATIC_JAVA = yes
else
MOZILLA_CLIENT = 1
MOZ_JSD = 1
DEFINES += -DMOZILLA_CLIENT
endif
ifndef MODULAR_NETLIB
MOZ_COOKIEMANAGE = 1
endif
ifndef USE_AUTOCONF
@ -539,18 +531,10 @@ ifdef MOZ_SINGLESIGNON
DEFINES += -DSingleSignon
endif
ifdef MOZ_COOKIEMANAGE
DEFINES += -DCookieManagement
endif
ifdef MOZ_SMOOTH_PROGRESS
DEFINES += -DSMOOTH_PROGRESS
endif
ifdef MOZ_EDITOR
DEFINES += -DNGEDITOR
endif
ifdef MOZ_SECURITY
DEFINES += -DMOZ_SECURITY
endif
@ -560,25 +544,10 @@ ifdef MOZ_FULLCIRCLE
DEFINES += -DMOZ_FULLCIRCLE
endif
# Build layers by default
ifndef NO_LAYERS
DEFINES += -DLAYERS
endif
ifdef BUILD_DEBUG_GC
DEFINES += -DDEBUG_GC
endif
ifdef BUILD_UNIX_PLUGINS
# UNIX_EMBED Should not be needed. For now these two defines go
# together until I talk with jg. --dp
DEFINES += -DUNIX_EMBED -DX_PLUGINS
endif
ifndef NO_UNIX_LDAP
DEFINES += -DUNIX_LDAP
endif
ifdef MOZ_MEDIUM
ifndef MODULAR_NETLIB
SMART_MAIL = 1
@ -629,8 +598,6 @@ ifdef JAVA_OR_NSJVM # XXX fix -- su can't depend on java
MOZ_SMARTUPDATE = 1
endif
DEFINES += -DJS_THREADSAFE
ifdef FORTEZZA
DEFINES += -DFORTEZZA
endif
@ -647,10 +614,6 @@ ifdef MOZ_DOM
DEFINES += -DDOM
endif
ifndef NO_UNIX_ASYNC_DNS
DEFINES += -DUNIX_ASYNC_DNS
endif
ifdef MOZ_TRANSACTION_RECEIPTS
DEFINES += -DTRANSACTION_RECEIPTS
endif
@ -670,27 +633,10 @@ ifndef USE_AUTOCONF
DEFINES += -DDEVELOPER_DEBUG
endif
#
# For the standalone image lib
#
ifdef STANDALONE_IMAGE_LIB
DEFINES += -DSTANDALONE_IMAGE_LIB
endif
ifdef MODULAR_NETLIB
DEFINES += -DMODULAR_NETLIB # -DNETLIB_THREAD
endif
ifndef MOZ_FE
MOZ_FE = x
endif
ifndef MOZ_USER_DIR
MOZ_USER_DIR = \".netscape\"
endif
DEFINES += -DMOZ_USER_DIR=$(MOZ_USER_DIR)
######################################################################
GARBAGE = $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o)