From 88aedd461b257a68b257ea4d2a5aeb0f8ef147fd Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Mon, 18 Jun 2001 22:10:38 +0000 Subject: [PATCH] Replaced NO_SHARED_LIB & NO_STATIC_LIB with BUILD_SHARED_LIBS, BUILD_STATIC_LIBS, FORCE_STATIC_LIB & FORCE_SHARED_LIB. Added FORCE_USE_PIC. Changes allow us to have a finer control over which parts of the tree are built with PIC. Part of the static build branch landing. Bug #46775 r=mcafee a=leaf git-svn-id: svn://10.0.0.236/trunk@97363 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/src/Makefile.in | 3 +- mozilla/config/autoconf.mk.in | 8 +- mozilla/config/config.mk | 25 +++- mozilla/config/rules.mk | 31 +++-- mozilla/configure | 120 ++++++++++-------- mozilla/configure.in | 34 +++-- mozilla/content/base/src/Makefile.in | 3 +- mozilla/content/events/src/Makefile.in | 3 +- mozilla/content/html/content/src/Makefile.in | 3 +- mozilla/content/html/document/src/Makefile.in | 3 +- mozilla/content/html/style/src/Makefile.in | 3 +- mozilla/content/shared/src/Makefile.in | 3 +- mozilla/content/xbl/src/Makefile.in | 3 +- mozilla/content/xml/content/src/Makefile.in | 3 +- mozilla/content/xml/document/src/Makefile.in | 3 +- mozilla/content/xsl/document/src/Makefile.in | 3 +- mozilla/content/xul/content/src/Makefile.in | 3 +- mozilla/content/xul/document/src/Makefile.in | 3 +- mozilla/content/xul/templates/src/Makefile.in | 3 +- mozilla/db/mork/src/Makefile.in | 3 - mozilla/dbm/src/Makefile.in | 3 +- mozilla/docshell/base/Makefile.in | 3 +- mozilla/dom/src/base/Makefile.in | 3 +- mozilla/dom/src/events/Makefile.in | 3 +- mozilla/editor/libeditor/base/src/Makefile.in | 3 +- mozilla/editor/libeditor/html/src/Makefile.in | 3 +- mozilla/editor/libeditor/text/src/Makefile.in | 3 +- mozilla/embedding/base/Makefile.in | 3 +- .../embedding/browser/webBrowser/Makefile.in | 3 +- .../components/appstartup/src/Makefile.in | 3 +- .../embedding/components/find/src/Makefile.in | 3 +- .../components/jsconsole/src/Makefile.in | 3 +- .../components/windowwatcher/src/Makefile.in | 3 +- mozilla/expat/xmlparse/Makefile.in | 3 +- mozilla/expat/xmltok/Makefile.in | 3 +- mozilla/extensions/datetime/Makefile.in | 3 +- mozilla/extensions/finger/Makefile.in | 3 +- .../extensions/inspector/base/src/Makefile.in | 3 +- mozilla/extensions/pics/src/Makefile.in | 3 +- mozilla/extensions/vixen/base/src/Makefile.in | 3 +- .../wallet/cookieviewer/Makefile.in | 3 +- mozilla/extensions/wallet/editor/Makefile.in | 3 +- .../wallet/signonviewer/Makefile.in | 3 +- .../wallet/walletpreview/Makefile.in | 3 +- .../webservices/soap/src/Makefile.in | 3 +- .../extensions/xmlextras/base/src/Makefile.in | 3 +- .../extensions/xmlextras/soap/src/Makefile.in | 3 +- mozilla/extensions/xmlterm/base/Makefile.in | 2 +- mozilla/gfx2/src/Makefile.in | 3 +- mozilla/intl/locale/src/Makefile.in | 3 +- mozilla/jpeg/Makefile.in | 2 +- mozilla/js/src/fdlibm/Makefile.in | 3 +- mozilla/layout/base/src/Makefile.in | 3 +- mozilla/layout/html/base/src/Makefile.in | 3 +- mozilla/layout/html/document/src/Makefile.in | 3 +- mozilla/layout/html/forms/src/Makefile.in | 3 +- mozilla/layout/html/style/src/Makefile.in | 3 +- mozilla/layout/html/table/src/Makefile.in | 3 +- mozilla/layout/mathml/base/src/Makefile.in | 3 +- mozilla/layout/mathml/content/src/Makefile.in | 3 +- mozilla/layout/svg/base/src/Makefile.in | 3 +- mozilla/layout/svg/content/src/Makefile.in | 3 +- mozilla/layout/xul/base/src/Makefile.in | 3 +- .../xul/base/src/outliner/src/Makefile.in | 3 +- mozilla/mailnews/absync/src/Makefile.in | 3 +- mozilla/mailnews/addrbook/src/Makefile.in | 3 +- mozilla/mailnews/base/search/src/Makefile.in | 3 +- mozilla/mailnews/base/src/Makefile.in | 3 +- mozilla/mailnews/compose/src/Makefile.in | 3 +- mozilla/mailnews/db/msgdb/src/Makefile.in | 3 +- mozilla/mailnews/imap/src/Makefile.in | 3 +- mozilla/mailnews/local/src/Makefile.in | 3 +- .../mailnews/mime/emitters/src/Makefile.in | 3 +- mozilla/mailnews/mime/src/Makefile.in | 3 +- mozilla/mailnews/news/src/Makefile.in | 3 +- mozilla/modules/libimg/mng/Makefile.in | 3 +- mozilla/modules/libimg/png/Makefile.in | 3 +- mozilla/modules/libimg/src/Makefile.in | 3 +- mozilla/modules/libjar/standalone/Makefile.in | 3 +- mozilla/modules/libreg/src/Makefile.in | 6 +- mozilla/modules/libreg/standalone/Makefile.in | 3 +- mozilla/modules/libutil/src/Makefile.in | 3 +- .../modules/mpfilelocprovider/src/Makefile.in | 3 +- mozilla/modules/zlib/src/Makefile.in | 2 +- mozilla/modules/zlib/standalone/Makefile.in | 3 +- mozilla/netwerk/base/src/Makefile.in | 3 +- mozilla/netwerk/cache/filecache/Makefile.in | 3 +- mozilla/netwerk/cache/memcache/Makefile.in | 3 +- mozilla/netwerk/cache/mgr/Makefile.in | 3 +- mozilla/netwerk/cache/src/Makefile.in | 3 +- mozilla/netwerk/dns/src/Makefile.in | 3 +- mozilla/netwerk/mime/src/Makefile.in | 3 +- .../netwerk/protocol/about/src/Makefile.in | 3 +- mozilla/netwerk/protocol/data/src/Makefile.in | 3 +- .../netwerk/protocol/datetime/src/Makefile.in | 3 +- mozilla/netwerk/protocol/file/src/Makefile.in | 3 +- .../netwerk/protocol/finger/src/Makefile.in | 3 +- mozilla/netwerk/protocol/ftp/src/Makefile.in | 3 +- .../netwerk/protocol/gopher/src/Makefile.in | 3 +- mozilla/netwerk/protocol/http/src/Makefile.in | 3 +- mozilla/netwerk/protocol/jar/src/Makefile.in | 3 +- .../netwerk/protocol/keyword/src/Makefile.in | 3 +- mozilla/netwerk/protocol/res/src/Makefile.in | 3 +- .../protocol/viewsource/src/Makefile.in | 3 +- mozilla/netwerk/socket/base/Makefile.in | 3 +- .../netwerk/streamconv/converters/Makefile.in | 3 +- mozilla/netwerk/streamconv/src/Makefile.in | 3 +- mozilla/parser/expat/lib/Makefile.in | 3 +- mozilla/rdf/base/src/Makefile.in | 3 +- mozilla/rdf/chrome/src/Makefile.in | 3 +- mozilla/rdf/datasource/src/Makefile.in | 3 +- mozilla/rdf/util/src/Makefile.in | 3 +- mozilla/string/obsolete/Makefile.in | 6 +- mozilla/string/src/Makefile.in | 6 +- mozilla/uriloader/base/Makefile.in | 3 +- mozilla/uriloader/exthandler/Makefile.in | 3 +- .../tests/viewer/unix/gtk/Makefile.in | 3 +- .../tests/viewer/unix/motif/Makefile.in | 3 +- .../webshell/tests/viewer/unix/qt/Makefile.in | 3 +- .../tests/viewer/unix/xlib/Makefile.in | 3 +- mozilla/widget/src/support/Makefile.in | 3 +- mozilla/widget/src/xpwidgets/Makefile.in | 3 +- mozilla/widget/timer/src/os2/Makefile.in | 3 +- mozilla/widget/timer/src/rhapsody/Makefile.in | 3 +- mozilla/widget/timer/src/unix/gtk/Makefile.in | 4 +- .../widget/timer/src/unix/motif/Makefile.in | 3 +- .../widget/timer/src/unix/photon/Makefile.in | 4 +- mozilla/widget/timer/src/unix/qt/Makefile.in | 4 +- .../widget/timer/src/unix/xlib/Makefile.in | 4 +- .../xpcom/appshell/eventloop/xp/Makefile.in | 3 +- mozilla/xpcom/base/Makefile.in | 6 +- mozilla/xpcom/build/Makefile.in | 7 +- mozilla/xpcom/components/Makefile.in | 6 +- mozilla/xpcom/ds/Makefile.in | 6 +- mozilla/xpcom/io/Makefile.in | 6 +- mozilla/xpcom/proxy/src/Makefile.in | 6 +- mozilla/xpcom/reflect/xptcall/src/Makefile.in | 6 +- .../reflect/xptcall/src/md/os2/Makefile.in | 3 +- .../reflect/xptcall/src/md/unix/Makefile.in | 6 +- mozilla/xpcom/reflect/xptinfo/src/Makefile.in | 6 +- mozilla/xpcom/string/obsolete/Makefile.in | 6 +- mozilla/xpcom/string/src/Makefile.in | 6 +- mozilla/xpcom/threads/Makefile.in | 6 +- mozilla/xpcom/typelib/xpt/src/Makefile.in | 6 +- .../components/autocomplete/src/Makefile.in | 3 +- .../xpfe/components/bookmarks/src/Makefile.in | 3 +- mozilla/xpfe/components/directory/Makefile.in | 3 +- .../xpfe/components/history/src/Makefile.in | 3 +- .../xpfe/components/related/src/Makefile.in | 3 +- .../xpfe/components/search/src/Makefile.in | 3 +- mozilla/xpfe/components/timebomb/Makefile.in | 3 +- .../components/urlbarhistory/src/Makefile.in | 3 +- .../xpinstall/wizard/libxpnet/src/Makefile.in | 3 +- 153 files changed, 331 insertions(+), 381 deletions(-) diff --git a/mozilla/accessible/src/Makefile.in b/mozilla/accessible/src/Makefile.in index d3bf10882af..5aef2e157b7 100644 --- a/mozilla/accessible/src/Makefile.in +++ b/mozilla/accessible/src/Makefile.in @@ -46,8 +46,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index e610e86e6e2..8f3d30fa5c5 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -70,10 +70,8 @@ USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@ MOZ_MAIL_NEWS = @MOZ_MAIL_NEWS@ MOZ_BRPROF = @MOZ_BRPROF@ NO_UNIX_ASYNC_DNS = @NO_UNIX_ASYNC_DNS@ -NO_SHARED_LIB = @NO_SHARED_LIB@ -NO_NETSCAPE_SHARED = @NO_SHARED_LIB@ -NO_STATIC_LIB = @NO_STATIC_LIB@ -NO_NETSCAPE_STATIC = @NO_STATIC_LIB@ +BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@ +BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@ MOZ_STATIC_COMPONENTS = @MOZ_STATIC_COMPONENTS@ ENABLE_TESTS = @ENABLE_TESTS@ IBMBIDI = @IBMBIDI@ @@ -248,7 +246,6 @@ NSPR_LIBS = @NSPR_LIBS@ # to normal behavior. Makefile's that create shared libraries out of # archives use these flags to force in all of the .o files in the # archives into the shared library. -ifndef NO_SHARED_LIB WRAP_MALLOC_LIB = @WRAP_MALLOC_LIB@ WRAP_MALLOC_CFLAGS = @WRAP_MALLOC_CFLAGS@ DSO_CFLAGS = @DSO_CFLAGS@ @@ -259,7 +256,6 @@ MKSHLIB_FORCE_ALL = @MKSHLIB_FORCE_ALL@ MKSHLIB_UNFORCE_ALL = @MKSHLIB_UNFORCE_ALL@ DSO_LDOPTS = @DSO_LDOPTS@ DLL_SUFFIX = @DLL_SUFFIX@ -endif NO_LD_ARCHIVE_FLAGS = @NO_LD_ARCHIVE_FLAGS@ diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 387a440e4d1..ea44bade1d3 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -238,14 +238,30 @@ endif OS_CFLAGS += $(DEBUG_FLAGS) OS_CXXFLAGS += $(DEBUG_FLAGS) +# Build using PIC by default +# Do not use PIC if not building a shared lib (see exceptions below) +# +ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)$(FORCE_USE_PIC)) +_ENABLE_PIC=1 +endif + ifneq (,$(IS_COMPONENT)) ifneq (, $(findstring $(LIBRARY_NAME), $(MOZ_STATIC_COMPONENTS))) DEFINES += -DNSGetModule=$(LIBRARY_NAME)_NSGetModule -DNSGetModule_components=$(LIBRARY_NAME)_NSGM_comps -DNSGetModule_components_count=$(LIBRARY_NAME)_NSGM_comp_count -NO_STATIC_LIB= -NO_SHARED_LIB=1 +FORCE_STATIC_LIB=1 endif endif +# +# Disable PIC if necessary +# + +ifndef _ENABLE_PIC +DSO_CFLAGS= +DSO_PIC_CFLAGS= +MKSHLIB= +endif + # # Personal makefile customizations go in these optional make include files. # @@ -400,6 +416,11 @@ MOZ_COMPONENT_XPCOM_LIBS += -lboehm XPCOM_LIBS += -lboehm endif +ifdef MOZ_DEMANGLE_SYMBOLS +MOZ_COMPONENT_XPCOM_LIBS += -liberty +XPCOM_LIBS += -liberty +endif + ifeq (xpconnect, $(findstring xpconnect, $(BUILD_MODULES))) DEFINES += -DXPCONNECT_STANDALONE endif diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index e80f0fd70f6..a07b47bc102 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -101,8 +101,11 @@ endif # # Library rules # -# If NO_STATIC_LIB is set, the static library will not be built. -# If NO_SHARED_LIB is set, the shared library will not be built. +# If BUILD_SHARED_LIBS or FORCE_SHARED_LIB is set and +# FORCE_STATIC_LIB is not set, +# the shared library will be built. +# If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set, +# the static library will be built. # ifeq ($(OS_ARCH),OS2) @@ -138,7 +141,7 @@ endif endif ifdef LIBRARY -ifndef NO_SHARED_LIB +ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)) ifdef MKSHLIB ifeq ($(OS_ARCH),OS2) @@ -164,15 +167,21 @@ IMPORT_LIBRARY := endif # OS2 endif # MKSHLIB -endif # !NO_SHARED_LIB +endif # BUILD_SHARED_LIBS || FORCE_SHARED_LIB endif # LIBRARY -ifdef NO_STATIC_LIB -LIBRARY = $(NULL) +ifeq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB)) +LIBRARY := $(NULL) endif -ifdef NO_SHARED_LIB -DLL_SUFFIX = .$(LIB_SUFFIX) +ifeq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)) +SHARED_LIBRARY := $(NULL) +endif + +ifdef FORCE_STATIC_LIB +ifndef FORCE_SHARED_LIB +SHARED_LIBRARY := $(NULL) +endif endif ifndef TARGETS @@ -521,7 +530,7 @@ export:: ifdef LIBRARY_NAME ifdef EXPORT_LIBRARY ifdef IS_COMPONENT -ifndef NO_STATIC_LIB +ifdef BUILD_STATIC_LIBS @$(PERL) $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) $(LIBRARY_NAME) endif else @@ -532,7 +541,7 @@ endif # LIBRARY_NAME ############################################## install:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(MAPS) -ifndef NO_STATIC_LIB +ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB)) ifdef LIBRARY ifeq ($(OS_ARCH),OS2) $(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib @@ -544,7 +553,7 @@ else endif endif # OS2 endif # LIBRARY -endif # ! NO_STATIC_LIB +endif # BUILD_STATIC_LIBS || FORCE_STATIC_LIB ifdef MAPS $(INSTALL) $(IFLAGS1) $(MAPS) $(DIST)/bin endif diff --git a/mozilla/configure b/mozilla/configure index 2efe32567db..ed40b130bb8 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -161,8 +161,6 @@ ac_help="$ac_help ac_help="$ac_help --enable-long-long-warning Pass -Wno-long-long to the compiler" -ac_help="$ac_help - --disable-shared Disable building of internal shared libs (BROKEN)" ac_help="$ac_help --enable-cpp-rtti Enable C++ RTTI " ac_help="$ac_help @@ -236,7 +234,9 @@ ac_help="$ac_help ac_help="$ac_help --with-os2vacpp Build for OS/2 with VAC++" ac_help="$ac_help - --enable-static Enable building of internal static libs (BROKEN)" + --disable-shared Disable building of internal shared libs" +ac_help="$ac_help + --enable-static Enable building of internal static libs" ac_help="$ac_help --enable-static-components Build meta-component from specific components" @@ -11828,19 +11828,6 @@ rm -f conftest* CFLAGS="$_SAVE_CFLAGS" fi -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - if test "$enableval" = "no"; then - NO_SHARED_LIB=1 - elif test "$enableval" = "yes"; then - : - else - { echo "configure: error: Option, shared, does not take an argument ($enableval)." 1>&2; exit 1; } - fi -fi - - # Check whether --enable-cpp-rtti or --disable-cpp-rtti was given. if test "${enable_cpp_rtti+set}" = set; then enableval="$enable_cpp_rtti" @@ -12065,7 +12052,7 @@ fi echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6 -echo "configure:12069: checking webshell leaks option" >&5 +echo "configure:12056: checking webshell leaks option" >&5 # Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given. if test "${enable_detect_webshell_leaks+set}" = set; then enableval="$enable_detect_webshell_leaks" @@ -12139,7 +12126,7 @@ if test "${enable_efence+set}" = set; then enableval="$enable_efence" if test "$enableval" = "yes"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 -echo "configure:12143: checking for malloc in -lefence" >&5 +echo "configure:12130: checking for malloc in -lefence" >&5 ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12147,7 +12134,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lefence $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12194,7 +12181,7 @@ fi echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6 -echo "configure:12198: checking for cplus_demangle in -liberty" >&5 +echo "configure:12185: checking for cplus_demangle in -liberty" >&5 ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12202,7 +12189,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liberty "-liberty" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12516,13 +12503,29 @@ fi -NO_STATIC_LIB=1 +BUILD_SHARED_LIBS=1 +BUILD_STATIC_LIBS= +MOZ_STATIC_COMPONENT_LIBS= + +# Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + if test "$enableval" = "no"; then + BUILD_SHARED_LIBS= + elif test "$enableval" = "yes"; then + : + else + { echo "configure: error: Option, shared, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + # Check whether --enable-static or --disable-static was given. if test "${enable_static+set}" = set; then enableval="$enable_static" if test "$enableval" = "yes"; then - NO_STATIC_LIB= + BUILD_STATIC_LIBS=1 + MOZ_STATIC_COMPONENT_LIBS=1 elif test "$enableval" = "no"; then : else @@ -12531,6 +12534,11 @@ if test "${enable_static+set}" = set; then fi +if (test -z "$BUILD_SHARED_LIBS" && test -z "$BUILD_STATIC_LIBS") || + (test -n "$BUILD_SHARED_LIBS" && test -n "$BUILD_STATIC_LIBS") ; then + { echo "configure: error: Only one of --enable-shared or --enable-static must be specified." 1>&2; exit 1; } +fi + # Check whether --enable-static-components or --disable-static-components was given. if test "${enable_static_components+set}" = set; then @@ -12542,7 +12550,7 @@ fi case "$target" in *-*-aix*) - if test "${NO_STATIC_LIB}" = "1" -o -z "${NO_SHARED_LIB}"; then + if test -z "${BUILD_STATIC_LIBS}" -o -n "${BUILD_SHARED_LIBS}"; then if test -f /usr/lpp/xlC/bin/makeC++SharedLib_r; then AIX_SHLIB_BIN='/usr/lpp/xlC/bin/makeC++SharedLib_r' elif test -f /usr/ibmcxx/bin/makeC++SharedLib_r; then @@ -12551,7 +12559,7 @@ case "$target" in # Extract the first word of "makeC++SharedLib_r", so it can be a program name with args. set dummy makeC++SharedLib_r; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12555: checking for $ac_word" >&5 +echo "configure:12563: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12589,8 +12597,8 @@ fi echo "*** Unable to locate makeC++SharedLib_r, needed for creation of shared" echo "*** libraries on AIX. You will only be able to build static libraries." echo - NO_STATIC_LIB='' - NO_SHARED_LIB=1 + BUILD_STATIC_LIBS=1 + BUILD_SHARED_LIBS= fi fi @@ -12697,7 +12705,7 @@ if test "$JPEG_DIR" = no; then SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:12701: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:12709: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12705,7 +12713,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12745,7 +12753,7 @@ if test "$SYSTEM_JPEG" = 1; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -12759,7 +12767,7 @@ else } EOF -if { (eval echo configure:12763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -12797,16 +12805,16 @@ if test "$ZLIB_DIR" = no; then SYSTEM_ZLIB= else echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6 -echo "configure:12801: checking "for zlib.h"" >&5 +echo "configure:12809: checking "for zlib.h"" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" SYSTEM_ZLIB=1 else @@ -12820,7 +12828,7 @@ rm -f conftest* fi if test "$SYSTEM_ZLIB" = 1; then echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:12824: checking for gzread in -lz" >&5 +echo "configure:12832: checking for gzread in -lz" >&5 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12828,7 +12836,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $ZLIB_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12885,7 +12893,7 @@ if test "$PNG_DIR" = no; then SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:12889: checking for png_get_valid in -lpng" >&5 +echo "configure:12897: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12893,7 +12901,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12932,7 +12940,7 @@ if test "$SYSTEM_PNG" = 1; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -12946,7 +12954,7 @@ else } EOF -if { (eval echo configure:12950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -12985,7 +12993,7 @@ if test "$MNG_DIR" = no; then SYSTEM_MNG= else echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6 -echo "configure:12989: checking for mng_initialize in -lmng" >&5 +echo "configure:12997: checking for mng_initialize in -lmng" >&5 ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12993,7 +13001,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmng $MNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13032,7 +13040,7 @@ if test "$SYSTEM_MNG" = 1; then SYSTEM_MNG= else cat > conftest.$ac_ext < #include @@ -13046,7 +13054,7 @@ else } EOF -if { (eval echo configure:13050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_MNG=1 else @@ -13112,9 +13120,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}" LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}" LIBS="-lfullsoft $LIBS" echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6 -echo "configure:13116: checking "for FCInitialize in -lfullsoft"" >&5; +echo "configure:13124: checking "for FCInitialize in -lfullsoft"" >&5; cat > conftest.$ac_ext < #include "fullsoft.h" @@ -13122,7 +13130,7 @@ int main() { FCInitialize(); exit(0); ; return 0; } EOF -if { (eval echo configure:13126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes" else @@ -13738,13 +13746,13 @@ s%@MOZ_LDAP_XPCOM_EXPERIMENTAL@%$MOZ_LDAP_XPCOM_EXPERIMENTAL%g s%@XPCOM_USE_LEA@%$XPCOM_USE_LEA%g s%@UNIX_CRASH_ON_ASSERT@%$UNIX_CRASH_ON_ASSERT%g s%@NO_UNIX_ASYNC_DNS@%$NO_UNIX_ASYNC_DNS%g -s%@NO_SHARED_LIB@%$NO_SHARED_LIB%g -s%@NO_STATIC_LIB@%$NO_STATIC_LIB%g +s%@BUILD_SHARED_LIBS@%$BUILD_SHARED_LIBS%g +s%@BUILD_STATIC_LIBS@%$BUILD_STATIC_LIBS%g +s%@MOZ_STATIC_COMPONENT_LIBS@%$MOZ_STATIC_COMPONENT_LIBS%g s%@MOZ_STATIC_COMPONENTS@%$MOZ_STATIC_COMPONENTS%g s%@ENABLE_TESTS@%$ENABLE_TESTS%g s%@IBMBIDI@%$IBMBIDI%g s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g -s%@FULL_STATIC_BUILD@%$FULL_STATIC_BUILD%g s%@BUILD_IDLC@%$BUILD_IDLC%g s%@MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@%$MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS%g s%@MOZ_COMPONENT_NSPR_LIBS@%$MOZ_COMPONENT_NSPR_LIBS%g diff --git a/mozilla/configure.in b/mozilla/configure.in index 4b862ada67e..b9012dfc117 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -3654,10 +3654,6 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then CFLAGS="$_SAVE_CFLAGS" fi -MOZ_ARG_DISABLE_BOOL(shared, -[ --disable-shared Disable building of internal shared libs (BROKEN)], - NO_SHARED_LIB=1) - dnl C++ rtti (g++/egcs only - for now) dnl Should be smarter and check that the compiler does indeed have rtti MOZ_ARG_ENABLE_BOOL(cpp-rtti, @@ -4013,11 +4009,23 @@ dnl = End OS/2 Build Options dnl = dnl ======================================================== -NO_STATIC_LIB=1 +BUILD_SHARED_LIBS=1 +BUILD_STATIC_LIBS= +MOZ_STATIC_COMPONENT_LIBS= + +MOZ_ARG_DISABLE_BOOL(shared, +[ --disable-shared Disable building of internal shared libs], + BUILD_SHARED_LIBS=) MOZ_ARG_ENABLE_BOOL(static, -[ --enable-static Enable building of internal static libs (BROKEN)], - NO_STATIC_LIB=) +[ --enable-static Enable building of internal static libs], + BUILD_STATIC_LIBS=1 + MOZ_STATIC_COMPONENT_LIBS=1) + +if (test -z "$BUILD_SHARED_LIBS" && test -z "$BUILD_STATIC_LIBS") || + (test -n "$BUILD_SHARED_LIBS" && test -n "$BUILD_STATIC_LIBS") ; then + AC_MSG_ERROR([Only one of --enable-shared or --enable-static must be specified.]) +fi dnl ======================================================== @@ -4030,7 +4038,7 @@ dnl ======================================================== case "$target" in *-*-aix*) - if test "${NO_STATIC_LIB}" = "1" -o -z "${NO_SHARED_LIB}"; then + if test -z "${BUILD_STATIC_LIBS}" -o -n "${BUILD_SHARED_LIBS}"; then if test -f /usr/lpp/xlC/bin/makeC++SharedLib_r; then AIX_SHLIB_BIN='/usr/lpp/xlC/bin/makeC++SharedLib_r' elif test -f /usr/ibmcxx/bin/makeC++SharedLib_r; then @@ -4042,8 +4050,8 @@ case "$target" in echo "*** Unable to locate makeC++SharedLib_r, needed for creation of shared" echo "*** libraries on AIX. You will only be able to build static libraries." echo - NO_STATIC_LIB='' - NO_SHARED_LIB=1 + BUILD_STATIC_LIBS=1 + BUILD_SHARED_LIBS= fi fi AC_SUBST(AIX_SHLIB_BIN) @@ -4116,13 +4124,13 @@ AC_SUBST(MOZ_LDAP_XPCOM_EXPERIMENTAL) AC_SUBST(XPCOM_USE_LEA) AC_SUBST(UNIX_CRASH_ON_ASSERT) AC_SUBST(NO_UNIX_ASYNC_DNS) -AC_SUBST(NO_SHARED_LIB) -AC_SUBST(NO_STATIC_LIB) +AC_SUBST(BUILD_SHARED_LIBS) +AC_SUBST(BUILD_STATIC_LIBS) +AC_SUBST(MOZ_STATIC_COMPONENT_LIBS) AC_SUBST(MOZ_STATIC_COMPONENTS) AC_SUBST(ENABLE_TESTS) AC_SUBST(IBMBIDI) AC_SUBST(MOZ_USER_DIR) -AC_SUBST(FULL_STATIC_BUILD) AC_SUBST(BUILD_IDLC) AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS) diff --git a/mozilla/content/base/src/Makefile.in b/mozilla/content/base/src/Makefile.in index 08b8cb32abc..3ad00354b53 100644 --- a/mozilla/content/base/src/Makefile.in +++ b/mozilla/content/base/src/Makefile.in @@ -65,8 +65,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in index d275fb39303..ba034638cf2 100644 --- a/mozilla/content/events/src/Makefile.in +++ b/mozilla/content/events/src/Makefile.in @@ -46,8 +46,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index 5e58f016253..b8d26a909d2 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/content/html/content/src/Makefile.in @@ -105,8 +105,7 @@ nsIHTMLTableColElement.h \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/html/document/src/Makefile.in b/mozilla/content/html/document/src/Makefile.in index 043228b24bd..8a6d91cd7df 100644 --- a/mozilla/content/html/document/src/Makefile.in +++ b/mozilla/content/html/document/src/Makefile.in @@ -46,8 +46,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/html/style/src/Makefile.in b/mozilla/content/html/style/src/Makefile.in index b104b186281..8942212373b 100644 --- a/mozilla/content/html/style/src/Makefile.in +++ b/mozilla/content/html/style/src/Makefile.in @@ -69,8 +69,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/shared/src/Makefile.in b/mozilla/content/shared/src/Makefile.in index cb89ca4effc..40da6760b6d 100644 --- a/mozilla/content/shared/src/Makefile.in +++ b/mozilla/content/shared/src/Makefile.in @@ -46,8 +46,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xbl/src/Makefile.in b/mozilla/content/xbl/src/Makefile.in index e8b02caaf1e..4d9e9f4ab6b 100644 --- a/mozilla/content/xbl/src/Makefile.in +++ b/mozilla/content/xbl/src/Makefile.in @@ -57,8 +57,7 @@ CPPSRCS = \ include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index 08eee891753..1eebe05c4dd 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -40,8 +40,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index 8bcf119067c..f8c088ee74c 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/content/xml/document/src/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xsl/document/src/Makefile.in b/mozilla/content/xsl/document/src/Makefile.in index 2ea96769f29..6fde81dcf6a 100755 --- a/mozilla/content/xsl/document/src/Makefile.in +++ b/mozilla/content/xsl/document/src/Makefile.in @@ -52,7 +52,6 @@ LOCAL_INCLUDES = \ MKSHLIB := # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xul/content/src/Makefile.in b/mozilla/content/xul/content/src/Makefile.in index a00e0845d39..ac7693087c9 100644 --- a/mozilla/content/xul/content/src/Makefile.in +++ b/mozilla/content/xul/content/src/Makefile.in @@ -40,8 +40,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xul/document/src/Makefile.in b/mozilla/content/xul/document/src/Makefile.in index 8b786ee960a..fad20c25ea8 100644 --- a/mozilla/content/xul/document/src/Makefile.in +++ b/mozilla/content/xul/document/src/Makefile.in @@ -42,8 +42,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xul/templates/src/Makefile.in b/mozilla/content/xul/templates/src/Makefile.in index f2a83bfede8..7fa7e01c1b1 100644 --- a/mozilla/content/xul/templates/src/Makefile.in +++ b/mozilla/content/xul/templates/src/Makefile.in @@ -56,8 +56,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/db/mork/src/Makefile.in b/mozilla/db/mork/src/Makefile.in index 491a9ea5cca..42142d7b64c 100644 --- a/mozilla/db/mork/src/Makefile.in +++ b/mozilla/db/mork/src/Makefile.in @@ -97,8 +97,5 @@ EXTRA_DSO_LDOPTS = \ $(NSPR_LIBS) \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dbm/src/Makefile.in b/mozilla/dbm/src/Makefile.in index ef54dd6759b..216faa43968 100644 --- a/mozilla/dbm/src/Makefile.in +++ b/mozilla/dbm/src/Makefile.in @@ -54,8 +54,7 @@ endif LOCAL_INCLUDES = -I$(srcdir)/../include -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in index 047ca87588f..47890aa606f 100644 --- a/mozilla/docshell/base/Makefile.in +++ b/mozilla/docshell/base/Makefile.in @@ -59,7 +59,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index f7e400f848d..2b395fa3365 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -48,8 +48,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/events/Makefile.in b/mozilla/dom/src/events/Makefile.in index 01cce060a45..5bb25046fe1 100644 --- a/mozilla/dom/src/events/Makefile.in +++ b/mozilla/dom/src/events/Makefile.in @@ -35,8 +35,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/editor/libeditor/base/src/Makefile.in b/mozilla/editor/libeditor/base/src/Makefile.in index e4b34d228d3..21d1101c96e 100644 --- a/mozilla/editor/libeditor/base/src/Makefile.in +++ b/mozilla/editor/libeditor/base/src/Makefile.in @@ -64,8 +64,7 @@ CPPSRCS += \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/editor/libeditor/html/src/Makefile.in b/mozilla/editor/libeditor/html/src/Makefile.in index 146eb2b94f0..3cff2232c88 100644 --- a/mozilla/editor/libeditor/html/src/Makefile.in +++ b/mozilla/editor/libeditor/html/src/Makefile.in @@ -45,8 +45,7 @@ CPPSRCS = \ $(NULL) # don't want the shared lib; force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 ifdef ENABLE_EDITOR_API_LOG CPPSRCS += nsHTMLEditorLog.cpp \ diff --git a/mozilla/editor/libeditor/text/src/Makefile.in b/mozilla/editor/libeditor/text/src/Makefile.in index ce87d04a723..34f538272e3 100644 --- a/mozilla/editor/libeditor/text/src/Makefile.in +++ b/mozilla/editor/libeditor/text/src/Makefile.in @@ -43,8 +43,7 @@ CPPSRCS = \ $(NULL) # don't want the shared lib; force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/base/Makefile.in b/mozilla/embedding/base/Makefile.in index 460144902a6..3772588db66 100644 --- a/mozilla/embedding/base/Makefile.in +++ b/mozilla/embedding/base/Makefile.in @@ -45,8 +45,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in index 4074e74c878..7bb952a0470 100644 --- a/mozilla/embedding/browser/webBrowser/Makefile.in +++ b/mozilla/embedding/browser/webBrowser/Makefile.in @@ -57,7 +57,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/components/appstartup/src/Makefile.in b/mozilla/embedding/components/appstartup/src/Makefile.in index 9c9e40776ad..b94c22e8b2e 100644 --- a/mozilla/embedding/components/appstartup/src/Makefile.in +++ b/mozilla/embedding/components/appstartup/src/Makefile.in @@ -37,8 +37,7 @@ EXPORTS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/components/find/src/Makefile.in b/mozilla/embedding/components/find/src/Makefile.in index 47d189e96b0..af9c223d7d6 100644 --- a/mozilla/embedding/components/find/src/Makefile.in +++ b/mozilla/embedding/components/find/src/Makefile.in @@ -33,8 +33,7 @@ CPPSRCS = nsWebBrowserFind.cpp \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/components/jsconsole/src/Makefile.in b/mozilla/embedding/components/jsconsole/src/Makefile.in index 775734d6883..dce9fd35328 100644 --- a/mozilla/embedding/components/jsconsole/src/Makefile.in +++ b/mozilla/embedding/components/jsconsole/src/Makefile.in @@ -33,8 +33,7 @@ CPPSRCS = nsJSConsoleService.cpp \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/components/windowwatcher/src/Makefile.in b/mozilla/embedding/components/windowwatcher/src/Makefile.in index 54ee76db919..2b37d6b7198 100644 --- a/mozilla/embedding/components/windowwatcher/src/Makefile.in +++ b/mozilla/embedding/components/windowwatcher/src/Makefile.in @@ -37,8 +37,7 @@ CPPSRCS = nsDialogParamBlock.cpp \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/expat/xmlparse/Makefile.in b/mozilla/expat/xmlparse/Makefile.in index e616b64bf40..6c34db4a62f 100644 --- a/mozilla/expat/xmlparse/Makefile.in +++ b/mozilla/expat/xmlparse/Makefile.in @@ -41,7 +41,6 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) LOCAL_INCLUDES = -I$(srcdir)/../xmltok # We want only the static lib, not the shared lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/expat/xmltok/Makefile.in b/mozilla/expat/xmltok/Makefile.in index f5fbd9dec97..5c93dd7465e 100644 --- a/mozilla/expat/xmltok/Makefile.in +++ b/mozilla/expat/xmltok/Makefile.in @@ -35,7 +35,6 @@ CSRCS = \ $(NULL) # We want only the static lib, not the shared lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/datetime/Makefile.in b/mozilla/extensions/datetime/Makefile.in index d9030789917..4c2a4295f00 100644 --- a/mozilla/extensions/datetime/Makefile.in +++ b/mozilla/extensions/datetime/Makefile.in @@ -37,7 +37,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/finger/Makefile.in b/mozilla/extensions/finger/Makefile.in index 1e0cf853516..30380689a67 100644 --- a/mozilla/extensions/finger/Makefile.in +++ b/mozilla/extensions/finger/Makefile.in @@ -36,7 +36,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/inspector/base/src/Makefile.in b/mozilla/extensions/inspector/base/src/Makefile.in index 5f5d482804a..7b8211afc4b 100644 --- a/mozilla/extensions/inspector/base/src/Makefile.in +++ b/mozilla/extensions/inspector/base/src/Makefile.in @@ -42,7 +42,6 @@ CPPSRCS= \ inFileSearch.cpp \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/pics/src/Makefile.in b/mozilla/extensions/pics/src/Makefile.in index d38a5d9353b..56663fe1ded 100644 --- a/mozilla/extensions/pics/src/Makefile.in +++ b/mozilla/extensions/pics/src/Makefile.in @@ -41,8 +41,7 @@ CSRCS = \ CPPSRCS = nsPICS.cpp # we don't want the shared lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/vixen/base/src/Makefile.in b/mozilla/extensions/vixen/base/src/Makefile.in index e6e3f0abb2e..71ee986f1ca 100644 --- a/mozilla/extensions/vixen/base/src/Makefile.in +++ b/mozilla/extensions/vixen/base/src/Makefile.in @@ -33,8 +33,7 @@ CPPSRCS = \ nsVixenShell.cpp \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/wallet/cookieviewer/Makefile.in b/mozilla/extensions/wallet/cookieviewer/Makefile.in index d9c7575fcd1..49b0c003379 100644 --- a/mozilla/extensions/wallet/cookieviewer/Makefile.in +++ b/mozilla/extensions/wallet/cookieviewer/Makefile.in @@ -36,7 +36,6 @@ CPPSRCS = nsCookieViewer.cpp XPIDLSRCS = nsICookieViewer.idl # we don't want the shared lib, but we want to force the creation of a static lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/wallet/editor/Makefile.in b/mozilla/extensions/wallet/editor/Makefile.in index b2a1ef4440a..6013928be8c 100644 --- a/mozilla/extensions/wallet/editor/Makefile.in +++ b/mozilla/extensions/wallet/editor/Makefile.in @@ -36,7 +36,6 @@ CPPSRCS = nsWalletEditor.cpp XPIDLSRCS = nsIWalletEditor.idl # we don't want the shared lib, but we want to force the creation of a static lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/wallet/signonviewer/Makefile.in b/mozilla/extensions/wallet/signonviewer/Makefile.in index ea1a30dc320..8ee2bc8dcbf 100644 --- a/mozilla/extensions/wallet/signonviewer/Makefile.in +++ b/mozilla/extensions/wallet/signonviewer/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = nsSignonViewer.cpp XPIDLSRCS = nsISignonViewer.idl # we don't want the shared lib, but we want to force the creation of a static lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/wallet/walletpreview/Makefile.in b/mozilla/extensions/wallet/walletpreview/Makefile.in index 94681a54c12..a84f406af97 100644 --- a/mozilla/extensions/wallet/walletpreview/Makefile.in +++ b/mozilla/extensions/wallet/walletpreview/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = nsWalletPreview.cpp XPIDLSRCS = nsIWalletPreview.idl # we don't want the shared lib, but we want to force the creation of a static lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/webservices/soap/src/Makefile.in b/mozilla/extensions/webservices/soap/src/Makefile.in index c6e1f526bb5..9c92f703175 100644 --- a/mozilla/extensions/webservices/soap/src/Makefile.in +++ b/mozilla/extensions/webservices/soap/src/Makefile.in @@ -42,7 +42,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/xmlextras/base/src/Makefile.in b/mozilla/extensions/xmlextras/base/src/Makefile.in index 9a5fbb5c9e7..1da66e24ba4 100644 --- a/mozilla/extensions/xmlextras/base/src/Makefile.in +++ b/mozilla/extensions/xmlextras/base/src/Makefile.in @@ -38,7 +38,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/xmlextras/soap/src/Makefile.in b/mozilla/extensions/xmlextras/soap/src/Makefile.in index c6e1f526bb5..9c92f703175 100644 --- a/mozilla/extensions/xmlextras/soap/src/Makefile.in +++ b/mozilla/extensions/xmlextras/soap/src/Makefile.in @@ -42,7 +42,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/xmlterm/base/Makefile.in b/mozilla/extensions/xmlterm/base/Makefile.in index c5b7737dbeb..ccbd3b7b45c 100644 --- a/mozilla/extensions/xmlterm/base/Makefile.in +++ b/mozilla/extensions/xmlterm/base/Makefile.in @@ -111,7 +111,7 @@ XPIDLSRCS = \ endif # Also create static library libxmlterm.a -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/config.mk diff --git a/mozilla/gfx2/src/Makefile.in b/mozilla/gfx2/src/Makefile.in index 45601903f4d..5373fd06c3b 100644 --- a/mozilla/gfx2/src/Makefile.in +++ b/mozilla/gfx2/src/Makefile.in @@ -41,8 +41,7 @@ CPPSRCS = \ #DIRS = gtk # we don't want the shared lib, but we want to force the creation of a static lib. -#override NO_SHARED_LIB=1 -#override NO_STATIC_LIB= +#FORCE_STATIC_LIB = 1 EXTRA_DSO_LDOPTS = \ $(MOZ_COMPONENT_LIBS) \ diff --git a/mozilla/intl/locale/src/Makefile.in b/mozilla/intl/locale/src/Makefile.in index f822faaba4b..bc3fef51abb 100644 --- a/mozilla/intl/locale/src/Makefile.in +++ b/mozilla/intl/locale/src/Makefile.in @@ -59,8 +59,7 @@ EXPORT_RESOURCE = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/jpeg/Makefile.in b/mozilla/jpeg/Makefile.in index ea89d6b68c2..7ff406e19ca 100644 --- a/mozilla/jpeg/Makefile.in +++ b/mozilla/jpeg/Makefile.in @@ -98,7 +98,7 @@ endif # need static lib for some of the libimg componentry to link properly ifneq ($(MOZ_WIDGET_TOOLKIT),os2) -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/js/src/fdlibm/Makefile.in b/mozilla/js/src/fdlibm/Makefile.in index d8c8ce4b214..c599a356e17 100644 --- a/mozilla/js/src/fdlibm/Makefile.in +++ b/mozilla/js/src/fdlibm/Makefile.in @@ -81,8 +81,7 @@ EXPORTS = fdlibm.h # we need to force a static lib for the linking that js/src/Makefile.in wants # to do, and we don't really need a shared library ever, so: -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in index 83f26fca4f8..37891ed5896 100644 --- a/mozilla/layout/base/src/Makefile.in +++ b/mozilla/layout/base/src/Makefile.in @@ -56,8 +56,7 @@ CPPSRCS += \ endif # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index 2f921d562cb..6e9d06709da 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -107,8 +107,7 @@ RESOURCES = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/html/document/src/Makefile.in b/mozilla/layout/html/document/src/Makefile.in index f3816b5e68f..bc435ed72b1 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/layout/html/document/src/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index b77f030eecf..dbbe1efe22d 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/layout/html/forms/src/Makefile.in @@ -57,8 +57,7 @@ CPPSRCS += nsGfxTextControlFrame.cpp endif # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 CHROME_DIR = locales/en-US CHROME_L10N_DIR = communicator/locale/layout diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in index b5192bb27a0..538efe74261 100644 --- a/mozilla/layout/html/style/src/Makefile.in +++ b/mozilla/layout/html/style/src/Makefile.in @@ -43,8 +43,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/html/table/src/Makefile.in b/mozilla/layout/html/table/src/Makefile.in index 8e18a7f0415..3fab9e440c9 100644 --- a/mozilla/layout/html/table/src/Makefile.in +++ b/mozilla/layout/html/table/src/Makefile.in @@ -45,8 +45,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/mathml/base/src/Makefile.in b/mozilla/layout/mathml/base/src/Makefile.in index 5ca00d04502..3b65f40bdec 100644 --- a/mozilla/layout/mathml/base/src/Makefile.in +++ b/mozilla/layout/mathml/base/src/Makefile.in @@ -71,8 +71,7 @@ MKSHLIB := # we don't want the shared lib, but we want to force the creation of a static lib. # do we still want this? - DJF -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/mathml/content/src/Makefile.in b/mozilla/layout/mathml/content/src/Makefile.in index a9f11feab9d..dd7ef1df9be 100644 --- a/mozilla/layout/mathml/content/src/Makefile.in +++ b/mozilla/layout/mathml/content/src/Makefile.in @@ -45,8 +45,7 @@ CPPSRCS = \ MKSHLIB := # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/svg/base/src/Makefile.in b/mozilla/layout/svg/base/src/Makefile.in index 0c881984edf..6cab5a54ec0 100644 --- a/mozilla/layout/svg/base/src/Makefile.in +++ b/mozilla/layout/svg/base/src/Makefile.in @@ -40,8 +40,7 @@ CPPSRCS = \ include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/svg/content/src/Makefile.in b/mozilla/layout/svg/content/src/Makefile.in index d2cef8507a9..c998af3d09b 100644 --- a/mozilla/layout/svg/content/src/Makefile.in +++ b/mozilla/layout/svg/content/src/Makefile.in @@ -33,8 +33,7 @@ REQUIRES = xpcom string CPPSRCS = nsSVGAtoms.cpp # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/xul/base/src/Makefile.in b/mozilla/layout/xul/base/src/Makefile.in index be713acff83..eaa11ad7e25 100644 --- a/mozilla/layout/xul/base/src/Makefile.in +++ b/mozilla/layout/xul/base/src/Makefile.in @@ -94,8 +94,7 @@ CPPSRCS = \ include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/xul/base/src/outliner/src/Makefile.in b/mozilla/layout/xul/base/src/outliner/src/Makefile.in index f353cc6f80f..f18a53b0b2a 100644 --- a/mozilla/layout/xul/base/src/outliner/src/Makefile.in +++ b/mozilla/layout/xul/base/src/outliner/src/Makefile.in @@ -58,7 +58,6 @@ LOCAL_INCLUDES = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/absync/src/Makefile.in b/mozilla/mailnews/absync/src/Makefile.in index 57c26300e83..8b3fdfa638c 100644 --- a/mozilla/mailnews/absync/src/Makefile.in +++ b/mozilla/mailnews/absync/src/Makefile.in @@ -48,8 +48,7 @@ EXPORTS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/addrbook/src/Makefile.in b/mozilla/mailnews/addrbook/src/Makefile.in index 5712656adf4..e0fe24fd286 100644 --- a/mozilla/mailnews/addrbook/src/Makefile.in +++ b/mozilla/mailnews/addrbook/src/Makefile.in @@ -75,8 +75,7 @@ EXPORTS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/search/src/Makefile.in b/mozilla/mailnews/base/search/src/Makefile.in index 2b6fd03cc7c..86e672016d3 100644 --- a/mozilla/mailnews/base/search/src/Makefile.in +++ b/mozilla/mailnews/base/search/src/Makefile.in @@ -55,8 +55,7 @@ EXPORTS = nsMsgFilterService.h \ # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/src/Makefile.in b/mozilla/mailnews/base/src/Makefile.in index 9d20998a179..67f56556967 100644 --- a/mozilla/mailnews/base/src/Makefile.in +++ b/mozilla/mailnews/base/src/Makefile.in @@ -92,8 +92,7 @@ EXPORTS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/compose/src/Makefile.in b/mozilla/mailnews/compose/src/Makefile.in index 11bab71eca6..cfcccd91ca0 100644 --- a/mozilla/mailnews/compose/src/Makefile.in +++ b/mozilla/mailnews/compose/src/Makefile.in @@ -88,8 +88,7 @@ EXPORTS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/db/msgdb/src/Makefile.in b/mozilla/mailnews/db/msgdb/src/Makefile.in index 63ab9604c7d..19bf330edcd 100644 --- a/mozilla/mailnews/db/msgdb/src/Makefile.in +++ b/mozilla/mailnews/db/msgdb/src/Makefile.in @@ -42,8 +42,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/imap/src/Makefile.in b/mozilla/mailnews/imap/src/Makefile.in index c92d4143e4a..7f2e320f3ad 100644 --- a/mozilla/mailnews/imap/src/Makefile.in +++ b/mozilla/mailnews/imap/src/Makefile.in @@ -72,8 +72,7 @@ CPPSRCS = \ include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/local/src/Makefile.in b/mozilla/mailnews/local/src/Makefile.in index 263ad359ea1..3d1f932190c 100644 --- a/mozilla/mailnews/local/src/Makefile.in +++ b/mozilla/mailnews/local/src/Makefile.in @@ -77,8 +77,7 @@ EXPORTS += \ endif # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/mime/emitters/src/Makefile.in b/mozilla/mailnews/mime/emitters/src/Makefile.in index 5fee4a919ad..93e3f25c74e 100644 --- a/mozilla/mailnews/mime/emitters/src/Makefile.in +++ b/mozilla/mailnews/mime/emitters/src/Makefile.in @@ -57,8 +57,7 @@ EXTRA_DSO_LDOPTS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in index 3a6f3b1aa1d..38029ccf5f0 100644 --- a/mozilla/mailnews/mime/src/Makefile.in +++ b/mozilla/mailnews/mime/src/Makefile.in @@ -94,8 +94,7 @@ EXPORTS = \ comi18n.h \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/news/src/Makefile.in b/mozilla/mailnews/news/src/Makefile.in index 962bef2164d..ad784093149 100644 --- a/mozilla/mailnews/news/src/Makefile.in +++ b/mozilla/mailnews/news/src/Makefile.in @@ -66,8 +66,7 @@ EXTRA_DSO_LDOPTS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/libimg/mng/Makefile.in b/mozilla/modules/libimg/mng/Makefile.in index a535aaf54ad..6c6cd9f1885 100644 --- a/mozilla/modules/libimg/mng/Makefile.in +++ b/mozilla/modules/libimg/mng/Makefile.in @@ -62,8 +62,7 @@ LOCAL_INCLUDES = -I$(srcdir) ifeq ($(MOZ_WIDGET_TOOLKIT),os2) EXTRA_DSO_LDOPTS = $(JPEG_LIBS) $(ZLIB_LIBS) else -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/libimg/png/Makefile.in b/mozilla/modules/libimg/png/Makefile.in index 8d001775b23..6509d4a6080 100644 --- a/mozilla/modules/libimg/png/Makefile.in +++ b/mozilla/modules/libimg/png/Makefile.in @@ -62,8 +62,7 @@ endif ifeq ($(MOZ_WIDGET_TOOLKIT),os2) EXTRA_DSO_LDOPTS = $(ZLIB_LIBS) else -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in index 1ea8a7259b2..3c243a72bd0 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -48,8 +48,7 @@ ifndef MOZ_JAVA LOCAL_JMC_SUBDIR = . endif -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/libjar/standalone/Makefile.in b/mozilla/modules/libjar/standalone/Makefile.in index db815affcae..45076b8f88f 100644 --- a/mozilla/modules/libjar/standalone/Makefile.in +++ b/mozilla/modules/libjar/standalone/Makefile.in @@ -39,8 +39,7 @@ CPPSRCS = $(MODULES_LIBJAR_LCPPSRCS) OBJS = $(addprefix S_,$(CPPSRCS:.cpp=.$(OBJ_SUFFIX))) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 #ifndef MOZ_NATIVE_ZLIB SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozz_s.$(LIB_SUFFIX) diff --git a/mozilla/modules/libreg/src/Makefile.in b/mozilla/modules/libreg/src/Makefile.in index ae7ada25a24..02c6df522a1 100644 --- a/mozilla/modules/libreg/src/Makefile.in +++ b/mozilla/modules/libreg/src/Makefile.in @@ -37,8 +37,10 @@ BIN_SRCS = VerReg.c reg.c vr_stubs.c PROGOBJS = $(addprefix R_,$(BIN_SRCS:.c=.o)) # We don't want a shared lib. Static lib only. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/config.mk diff --git a/mozilla/modules/libreg/standalone/Makefile.in b/mozilla/modules/libreg/standalone/Makefile.in index 85f269f8ff0..8fdc3d995a9 100644 --- a/mozilla/modules/libreg/standalone/Makefile.in +++ b/mozilla/modules/libreg/standalone/Makefile.in @@ -35,8 +35,7 @@ CSRCS = $(MODULES_LIBREG_SRC_LCSRCS) OBJS = $(addprefix S_,$(CSRCS:.c=.$(OBJ_SUFFIX))) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 MDDEPDIR := $(MDDEPDIR)_S diff --git a/mozilla/modules/libutil/src/Makefile.in b/mozilla/modules/libutil/src/Makefile.in index 6c8268bbf33..23e4dce3e7e 100644 --- a/mozilla/modules/libutil/src/Makefile.in +++ b/mozilla/modules/libutil/src/Makefile.in @@ -33,8 +33,7 @@ REQUIRES = xpcom CSRCS = obs.c CPPSRCS = stopwatch.cpp -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/mpfilelocprovider/src/Makefile.in b/mozilla/modules/mpfilelocprovider/src/Makefile.in index 54e4bfec999..fa0854b9ac4 100755 --- a/mozilla/modules/mpfilelocprovider/src/Makefile.in +++ b/mozilla/modules/mpfilelocprovider/src/Makefile.in @@ -33,8 +33,7 @@ REQUIRES = xpcom string CPPSRCS = nsMPFileLocProvider.cpp # we don't want the shared lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/zlib/src/Makefile.in b/mozilla/modules/zlib/src/Makefile.in index e811ac71f4e..036b8133066 100644 --- a/mozilla/modules/zlib/src/Makefile.in +++ b/mozilla/modules/zlib/src/Makefile.in @@ -37,7 +37,7 @@ EXPORTS = $(MODULES_ZLIB_SRC_LEXPORTS) # need a static lib for some components (pngcom, say) ifneq ($(MOZ_WIDGET_TOOLKIT),os2) -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS) diff --git a/mozilla/modules/zlib/standalone/Makefile.in b/mozilla/modules/zlib/standalone/Makefile.in index 336df813ccd..8f46940b4ec 100644 --- a/mozilla/modules/zlib/standalone/Makefile.in +++ b/mozilla/modules/zlib/standalone/Makefile.in @@ -37,8 +37,7 @@ EXPORTS = $(MODULES_ZLIB_SRC_LEXPORTS) OBJS = $(addprefix S_,$(CSRCS:.c=.$(OBJ_SUFFIX))) ifneq ($(MOZ_WIDGET_TOOLKIT),os2) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS) diff --git a/mozilla/netwerk/base/src/Makefile.in b/mozilla/netwerk/base/src/Makefile.in index 8319c699487..9afadf339de 100644 --- a/mozilla/netwerk/base/src/Makefile.in +++ b/mozilla/netwerk/base/src/Makefile.in @@ -69,8 +69,7 @@ JSFILES = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/cache/filecache/Makefile.in b/mozilla/netwerk/cache/filecache/Makefile.in index a949598f332..ee8270bcb0f 100644 --- a/mozilla/netwerk/cache/filecache/Makefile.in +++ b/mozilla/netwerk/cache/filecache/Makefile.in @@ -51,8 +51,7 @@ EXTRA_LIBS = $(NSPR_LIBS) # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/cache/memcache/Makefile.in b/mozilla/netwerk/cache/memcache/Makefile.in index 43708bd8a70..b9683e87b5a 100644 --- a/mozilla/netwerk/cache/memcache/Makefile.in +++ b/mozilla/netwerk/cache/memcache/Makefile.in @@ -39,8 +39,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/cache/mgr/Makefile.in b/mozilla/netwerk/cache/mgr/Makefile.in index d833b71c49c..0864098fce9 100644 --- a/mozilla/netwerk/cache/mgr/Makefile.in +++ b/mozilla/netwerk/cache/mgr/Makefile.in @@ -47,8 +47,7 @@ EXTRA_LIBS = $(NSPR_LIBS) # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/cache/src/Makefile.in b/mozilla/netwerk/cache/src/Makefile.in index ba492506f12..7660ef4b5cb 100644 --- a/mozilla/netwerk/cache/src/Makefile.in +++ b/mozilla/netwerk/cache/src/Makefile.in @@ -61,8 +61,7 @@ EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS) # we don't want the shared lib, but we want to force the creation of a # static lib. -#override NO_SHARED_LIB=1 -#override NO_STATIC_LIB= +#FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/dns/src/Makefile.in b/mozilla/netwerk/dns/src/Makefile.in index a26e694a224..806ff08ca8b 100644 --- a/mozilla/netwerk/dns/src/Makefile.in +++ b/mozilla/netwerk/dns/src/Makefile.in @@ -33,8 +33,7 @@ CPPSRCS = nsDnsService.cpp # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in index b3b23f23b29..fda390c6473 100644 --- a/mozilla/netwerk/mime/src/Makefile.in +++ b/mozilla/netwerk/mime/src/Makefile.in @@ -38,8 +38,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in index 4228511b749..7352cac0331 100644 --- a/mozilla/netwerk/protocol/about/src/Makefile.in +++ b/mozilla/netwerk/protocol/about/src/Makefile.in @@ -44,7 +44,6 @@ endif # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/data/src/Makefile.in b/mozilla/netwerk/protocol/data/src/Makefile.in index ed0f8f78324..11567a87106 100644 --- a/mozilla/netwerk/protocol/data/src/Makefile.in +++ b/mozilla/netwerk/protocol/data/src/Makefile.in @@ -37,8 +37,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/datetime/src/Makefile.in b/mozilla/netwerk/protocol/datetime/src/Makefile.in index d9030789917..4c2a4295f00 100644 --- a/mozilla/netwerk/protocol/datetime/src/Makefile.in +++ b/mozilla/netwerk/protocol/datetime/src/Makefile.in @@ -37,7 +37,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in index 6f83c78e900..e788db624bc 100644 --- a/mozilla/netwerk/protocol/file/src/Makefile.in +++ b/mozilla/netwerk/protocol/file/src/Makefile.in @@ -37,8 +37,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/finger/src/Makefile.in b/mozilla/netwerk/protocol/finger/src/Makefile.in index 1e0cf853516..30380689a67 100644 --- a/mozilla/netwerk/protocol/finger/src/Makefile.in +++ b/mozilla/netwerk/protocol/finger/src/Makefile.in @@ -36,7 +36,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in index 72fae1a9538..a89f4d349a9 100644 --- a/mozilla/netwerk/protocol/ftp/src/Makefile.in +++ b/mozilla/netwerk/protocol/ftp/src/Makefile.in @@ -39,8 +39,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/gopher/src/Makefile.in b/mozilla/netwerk/protocol/gopher/src/Makefile.in index 39364c55d31..aa62cf029f6 100644 --- a/mozilla/netwerk/protocol/gopher/src/Makefile.in +++ b/mozilla/netwerk/protocol/gopher/src/Makefile.in @@ -36,7 +36,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in index bd7cb858e45..e0dec3bc9da 100644 --- a/mozilla/netwerk/protocol/http/src/Makefile.in +++ b/mozilla/netwerk/protocol/http/src/Makefile.in @@ -48,7 +48,6 @@ LOCAL_INCLUDES=-I$(srcdir)/../../../streamconv/converters # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/jar/src/Makefile.in b/mozilla/netwerk/protocol/jar/src/Makefile.in index 6ece494f5de..d5953b9da6b 100644 --- a/mozilla/netwerk/protocol/jar/src/Makefile.in +++ b/mozilla/netwerk/protocol/jar/src/Makefile.in @@ -38,8 +38,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/keyword/src/Makefile.in b/mozilla/netwerk/protocol/keyword/src/Makefile.in index 91618bf311c..26e04ae0360 100644 --- a/mozilla/netwerk/protocol/keyword/src/Makefile.in +++ b/mozilla/netwerk/protocol/keyword/src/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/res/src/Makefile.in b/mozilla/netwerk/protocol/res/src/Makefile.in index ab075ae9833..deb420c5a7b 100644 --- a/mozilla/netwerk/protocol/res/src/Makefile.in +++ b/mozilla/netwerk/protocol/res/src/Makefile.in @@ -39,8 +39,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/viewsource/src/Makefile.in b/mozilla/netwerk/protocol/viewsource/src/Makefile.in index fff035d903b..fd75be5cf7d 100644 --- a/mozilla/netwerk/protocol/viewsource/src/Makefile.in +++ b/mozilla/netwerk/protocol/viewsource/src/Makefile.in @@ -37,7 +37,6 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/socket/base/Makefile.in b/mozilla/netwerk/socket/base/Makefile.in index efaa5e569cb..3a870ccf5e2 100755 --- a/mozilla/netwerk/socket/base/Makefile.in +++ b/mozilla/netwerk/socket/base/Makefile.in @@ -45,8 +45,7 @@ XPIDLSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/streamconv/converters/Makefile.in b/mozilla/netwerk/streamconv/converters/Makefile.in index d9a0966cc0e..9708091713a 100644 --- a/mozilla/netwerk/streamconv/converters/Makefile.in +++ b/mozilla/netwerk/streamconv/converters/Makefile.in @@ -48,8 +48,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/streamconv/src/Makefile.in b/mozilla/netwerk/streamconv/src/Makefile.in index 5194e339e31..e6be5508b64 100644 --- a/mozilla/netwerk/streamconv/src/Makefile.in +++ b/mozilla/netwerk/streamconv/src/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/parser/expat/lib/Makefile.in b/mozilla/parser/expat/lib/Makefile.in index e616b64bf40..6c34db4a62f 100644 --- a/mozilla/parser/expat/lib/Makefile.in +++ b/mozilla/parser/expat/lib/Makefile.in @@ -41,7 +41,6 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) LOCAL_INCLUDES = -I$(srcdir)/../xmltok # We want only the static lib, not the shared lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/rdf/base/src/Makefile.in b/mozilla/rdf/base/src/Makefile.in index 7d10b28b1c2..e2195cf772a 100644 --- a/mozilla/rdf/base/src/Makefile.in +++ b/mozilla/rdf/base/src/Makefile.in @@ -48,8 +48,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/rdf/chrome/src/Makefile.in b/mozilla/rdf/chrome/src/Makefile.in index bf21fd3c76d..7806ee6e74b 100644 --- a/mozilla/rdf/chrome/src/Makefile.in +++ b/mozilla/rdf/chrome/src/Makefile.in @@ -37,8 +37,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/rdf/datasource/src/Makefile.in b/mozilla/rdf/datasource/src/Makefile.in index f7b04d07842..a5314174192 100644 --- a/mozilla/rdf/datasource/src/Makefile.in +++ b/mozilla/rdf/datasource/src/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/rdf/util/src/Makefile.in b/mozilla/rdf/util/src/Makefile.in index afde50953a9..52984478b1c 100644 --- a/mozilla/rdf/util/src/Makefile.in +++ b/mozilla/rdf/util/src/Makefile.in @@ -33,8 +33,7 @@ REQUIRES = xpcom string rdf CPPSRCS = nsRDFResource.cpp # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/string/obsolete/Makefile.in b/mozilla/string/obsolete/Makefile.in index 680fe15a317..424af3d252b 100644 --- a/mozilla/string/obsolete/Makefile.in +++ b/mozilla/string/obsolete/Makefile.in @@ -50,8 +50,10 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/string/src/Makefile.in b/mozilla/string/src/Makefile.in index be254045c02..18983106d97 100644 --- a/mozilla/string/src/Makefile.in +++ b/mozilla/string/src/Makefile.in @@ -53,8 +53,10 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/uriloader/base/Makefile.in b/mozilla/uriloader/base/Makefile.in index fbfe98ef622..562c6891afd 100644 --- a/mozilla/uriloader/base/Makefile.in +++ b/mozilla/uriloader/base/Makefile.in @@ -49,8 +49,7 @@ EXPORTS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/uriloader/exthandler/Makefile.in b/mozilla/uriloader/exthandler/Makefile.in index 0979ac2631e..3e1847b6a0c 100644 --- a/mozilla/uriloader/exthandler/Makefile.in +++ b/mozilla/uriloader/exthandler/Makefile.in @@ -63,8 +63,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in index 355a517cb28..01d5a8bdc4b 100644 --- a/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/gtk/Makefile.in @@ -35,8 +35,7 @@ CPPSRCS = \ nsGtkMenu.cpp \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/tests/viewer/unix/motif/Makefile.in b/mozilla/webshell/tests/viewer/unix/motif/Makefile.in index 134d07f6653..af576643273 100644 --- a/mozilla/webshell/tests/viewer/unix/motif/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/motif/Makefile.in @@ -33,8 +33,7 @@ CPPSRCS = \ nsMotifMenu.cpp \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/tests/viewer/unix/qt/Makefile.in b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in index 34cc1ed2c57..0737ee43342 100644 --- a/mozilla/webshell/tests/viewer/unix/qt/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = \ moc_nsQtMenu.cpp \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in b/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in index 68cd316ee34..bdeb494aec5 100644 --- a/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/xlib/Makefile.in @@ -32,8 +32,7 @@ REQUIRES = xpcom string webshell htmlparser webbrwsr necko widget layout dom js CPPSRCS = nsXlibMain.cpp -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/src/support/Makefile.in b/mozilla/widget/src/support/Makefile.in index 8be47e77c48..94bd6632f4f 100644 --- a/mozilla/widget/src/support/Makefile.in +++ b/mozilla/widget/src/support/Makefile.in @@ -35,8 +35,7 @@ CPPSRCS = nsWidgetSupport.cpp EXPORTS = nsWidgetSupport.h # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index 424e2a3b7ae..b16b7fec551 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/widget/src/xpwidgets/Makefile.in @@ -55,8 +55,7 @@ LOCAL_INCLUDES = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/timer/src/os2/Makefile.in b/mozilla/widget/timer/src/os2/Makefile.in index 24e3df65945..25176c57816 100644 --- a/mozilla/widget/timer/src/os2/Makefile.in +++ b/mozilla/widget/timer/src/os2/Makefile.in @@ -50,8 +50,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/timer/src/rhapsody/Makefile.in b/mozilla/widget/timer/src/rhapsody/Makefile.in index abb1f273c39..383c087311e 100644 --- a/mozilla/widget/timer/src/rhapsody/Makefile.in +++ b/mozilla/widget/timer/src/rhapsody/Makefile.in @@ -32,8 +32,7 @@ LIBRARY_NAME = timer_s CPPSRCS = nsTimer.cpp -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/timer/src/unix/gtk/Makefile.in b/mozilla/widget/timer/src/unix/gtk/Makefile.in index 3bcd0c2e813..1bf8dc81e06 100644 --- a/mozilla/widget/timer/src/unix/gtk/Makefile.in +++ b/mozilla/widget/timer/src/unix/gtk/Makefile.in @@ -36,12 +36,12 @@ ifndef MOZ_MONOLITHIC_TOOLKIT EXPORT_LIBRARY = 1 TIMER_SUFFIX = gtk IS_COMPONENT = 1 +COMPONENT_NAME = nsGtkTimerModule CPPSRCS += nsTimerGtkFactory.cpp EXTRA_DSO_LDOPTS = $(MOZ_GTK_LDFLAGS) $(MOZ_COMPONENT_LIBS) else TIMER_SUFFIX = s -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/timer/src/unix/motif/Makefile.in b/mozilla/widget/timer/src/unix/motif/Makefile.in index 167cdd86e1d..9463fb99fc5 100644 --- a/mozilla/widget/timer/src/unix/motif/Makefile.in +++ b/mozilla/widget/timer/src/unix/motif/Makefile.in @@ -38,8 +38,7 @@ CPPSRCS += nsTimerMotifFactory.cpp EXTRA_DSO_LDOPTS = $(MOZ_MOTIF_LDFLAGS) else TIMER_SUFFIX = s -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/timer/src/unix/photon/Makefile.in b/mozilla/widget/timer/src/unix/photon/Makefile.in index 73d2c4a8c70..16c4e9daacb 100644 --- a/mozilla/widget/timer/src/unix/photon/Makefile.in +++ b/mozilla/widget/timer/src/unix/photon/Makefile.in @@ -34,12 +34,12 @@ CPPSRCS = nsTimerPh.cpp ifndef MOZ_MONOLITHIC_TOOLKIT TIMER_SUFFIX = photon IS_COMPONENT = 1 +COMPONENT_NAME = nsPhTimerModule CPPSRCS += nsTimerPhFactory.cpp EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS) else TIMER_SUFFIX = s -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/timer/src/unix/qt/Makefile.in b/mozilla/widget/timer/src/unix/qt/Makefile.in index 76ad092d0f7..c79b8cd2079 100644 --- a/mozilla/widget/timer/src/unix/qt/Makefile.in +++ b/mozilla/widget/timer/src/unix/qt/Makefile.in @@ -45,12 +45,12 @@ ifndef MOZ_MONOLITHIC_TOOLKIT EXPORT_LIBRARY = 1 TIMER_SUFFIX = qt IS_COMPONENT = 1 +COMPONENT_NAME = nsQtTimerModule CPPSRCS += nsTimerQtFactory.cpp EXTRA_DSO_LDOPTS = $(MOZ_QT_LDFLAGS) $(MOZ_COMPONENT_LIBS) else TIMER_SUFFIX = s -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/timer/src/unix/xlib/Makefile.in b/mozilla/widget/timer/src/unix/xlib/Makefile.in index cf4a1e21b74..1ccb146beaf 100644 --- a/mozilla/widget/timer/src/unix/xlib/Makefile.in +++ b/mozilla/widget/timer/src/unix/xlib/Makefile.in @@ -36,12 +36,12 @@ ifndef MOZ_MONOLITHIC_TOOLKIT EXPORT_LIBRARY = 1 TIMER_SUFFIX = xlib IS_COMPONENT = 1 +COMPONENT_NAME = nsXlibTimerModule CPPSRCS += nsTimerXlibFactory.cpp EXTRA_DSO_LDOPTS = $(MOZ_XLIB_LDFLAGS) $(MOZ_COMPONENT_LIBS) else TIMER_SUFFIX = s -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/appshell/eventloop/xp/Makefile.in b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in index ca047adac51..ffa46073fa8 100644 --- a/mozilla/xpcom/appshell/eventloop/xp/Makefile.in +++ b/mozilla/xpcom/appshell/eventloop/xp/Makefile.in @@ -52,8 +52,7 @@ XPIDLSRCS = \ LOCAL_INCLUDES = -I. # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in index 3252549497a..248fad8c6fc 100644 --- a/mozilla/xpcom/base/Makefile.in +++ b/mozilla/xpcom/base/Makefile.in @@ -109,8 +109,10 @@ endif EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in index c2c803bbac1..e20648568c1 100644 --- a/mozilla/xpcom/build/Makefile.in +++ b/mozilla/xpcom/build/Makefile.in @@ -75,7 +75,12 @@ endif ifeq ($(MOZ_WIDGET_TOOLKIT),os2) XPCOM_SWITCH = 1 endif - + +# Force use of PIC +FORCE_USE_PIC = 1 + +FORCE_SHARED_LIB = 1 + include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in index 9ad1e93f817..19026df5cde 100644 --- a/mozilla/xpcom/components/Makefile.in +++ b/mozilla/xpcom/components/Makefile.in @@ -67,8 +67,10 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) LOCAL_INCLUDES = -I$(srcdir)/../base -I$(srcdir)/../thread # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/ds/Makefile.in b/mozilla/xpcom/ds/Makefile.in index 73913ccbeb7..36c695657f9 100644 --- a/mozilla/xpcom/ds/Makefile.in +++ b/mozilla/xpcom/ds/Makefile.in @@ -117,8 +117,10 @@ XPIDLSRCS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in index 1df9fd69111..fae810b50e4 100644 --- a/mozilla/xpcom/io/Makefile.in +++ b/mozilla/xpcom/io/Makefile.in @@ -104,8 +104,10 @@ XPIDLSRCS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/proxy/src/Makefile.in b/mozilla/xpcom/proxy/src/Makefile.in index ffa3427ec2d..091f00b7f4a 100644 --- a/mozilla/xpcom/proxy/src/Makefile.in +++ b/mozilla/xpcom/proxy/src/Makefile.in @@ -41,8 +41,10 @@ CPPSRCS = \ DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE -DEXPORT_XPTC_API # No shared lib; Force creation of static lib -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/reflect/xptcall/src/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/Makefile.in index 45b64c42fdb..6a5f784bac4 100644 --- a/mozilla/xpcom/reflect/xptcall/src/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/src/Makefile.in @@ -35,8 +35,10 @@ DIRS = md CPPSRCS = xptcall.cpp # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in index ebe8fe09d0c..0a9171ca0c4 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/src/md/os2/Makefile.in @@ -38,8 +38,7 @@ endif CPPSRCS += xptcstubs_os2.cpp # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in index 3620851dae0..de69a2d21d3 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -34,6 +34,9 @@ LIBRARY_NAME = xptcmd # CPPSRCS := xptcinvoke_unsupported.cpp xptcstubs_unsupported.cpp +# Force use of PIC +FORCE_USE_PIC = 1 + include $(topsrcdir)/config/config.mk ###################################################################### @@ -247,8 +250,7 @@ endif endif # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in index 7ca585077a6..2d6e6b0f6e6 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in +++ b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in @@ -44,8 +44,10 @@ CPPSRCS = \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/string/obsolete/Makefile.in b/mozilla/xpcom/string/obsolete/Makefile.in index 680fe15a317..424af3d252b 100644 --- a/mozilla/xpcom/string/obsolete/Makefile.in +++ b/mozilla/xpcom/string/obsolete/Makefile.in @@ -50,8 +50,10 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/string/src/Makefile.in b/mozilla/xpcom/string/src/Makefile.in index be254045c02..18983106d97 100644 --- a/mozilla/xpcom/string/src/Makefile.in +++ b/mozilla/xpcom/string/src/Makefile.in @@ -53,8 +53,10 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in index 4e8ba911c27..86be623c846 100644 --- a/mozilla/xpcom/threads/Makefile.in +++ b/mozilla/xpcom/threads/Makefile.in @@ -64,8 +64,10 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) LOCAL_INCLUDES = -I$(srcdir)/../components # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/typelib/xpt/src/Makefile.in b/mozilla/xpcom/typelib/xpt/src/Makefile.in index 3da256e11fa..9a29e2e9341 100644 --- a/mozilla/xpcom/typelib/xpt/src/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/src/Makefile.in @@ -38,8 +38,10 @@ CSRCS = xpt_arena.c xpt_struct.c xpt_xdr.c HOST_CSRCS = $(CSRCS) # we don't want the shared lib, but we want to force the creation of a static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 + +# Force use of PIC +FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/autocomplete/src/Makefile.in b/mozilla/xpfe/components/autocomplete/src/Makefile.in index 7f2e52ce2fe..e6cef914de6 100644 --- a/mozilla/xpfe/components/autocomplete/src/Makefile.in +++ b/mozilla/xpfe/components/autocomplete/src/Makefile.in @@ -37,8 +37,7 @@ REQUIRES += mozldap necko CPPSRCS += nsLDAPAutoCompleteSession.cpp endif -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/bookmarks/src/Makefile.in b/mozilla/xpfe/components/bookmarks/src/Makefile.in index 6a97e61919e..0251a7c7159 100644 --- a/mozilla/xpfe/components/bookmarks/src/Makefile.in +++ b/mozilla/xpfe/components/bookmarks/src/Makefile.in @@ -34,8 +34,7 @@ CPPSRCS = nsBookmarksService.cpp # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in index 6bd87704c4a..7aa7be32330 100644 --- a/mozilla/xpfe/components/directory/Makefile.in +++ b/mozilla/xpfe/components/directory/Makefile.in @@ -36,8 +36,7 @@ CPPSRCS = nsDirectoryViewer.cpp # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/history/src/Makefile.in b/mozilla/xpfe/components/history/src/Makefile.in index 1df5cf3d288..eca1533f077 100644 --- a/mozilla/xpfe/components/history/src/Makefile.in +++ b/mozilla/xpfe/components/history/src/Makefile.in @@ -35,8 +35,7 @@ CPPSRCS = nsGlobalHistory.cpp \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/related/src/Makefile.in b/mozilla/xpfe/components/related/src/Makefile.in index e7790fc44cf..230bd449e8b 100644 --- a/mozilla/xpfe/components/related/src/Makefile.in +++ b/mozilla/xpfe/components/related/src/Makefile.in @@ -34,8 +34,7 @@ CPPSRCS = nsRelatedLinksHandler.cpp # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/search/src/Makefile.in b/mozilla/xpfe/components/search/src/Makefile.in index 5340c1f00de..52b7b87cdae 100755 --- a/mozilla/xpfe/components/search/src/Makefile.in +++ b/mozilla/xpfe/components/search/src/Makefile.in @@ -37,8 +37,7 @@ CPPSRCS = \ # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/timebomb/Makefile.in b/mozilla/xpfe/components/timebomb/Makefile.in index c3c9d26c009..92b4623a39d 100644 --- a/mozilla/xpfe/components/timebomb/Makefile.in +++ b/mozilla/xpfe/components/timebomb/Makefile.in @@ -20,8 +20,7 @@ EXPORTS = nsTimeBomb.h # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/components/urlbarhistory/src/Makefile.in b/mozilla/xpfe/components/urlbarhistory/src/Makefile.in index ac8ce47953e..12661eca78c 100644 --- a/mozilla/xpfe/components/urlbarhistory/src/Makefile.in +++ b/mozilla/xpfe/components/urlbarhistory/src/Makefile.in @@ -34,7 +34,6 @@ CPPSRCS = nsUrlbarHistory.cpp # we don't want the shared lib, but we want to force the creation of a # static lib. -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in b/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in index 0a5e73219b6..37d4986fade 100644 --- a/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in +++ b/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in @@ -37,8 +37,7 @@ CPPSRCS = \ nsHTTPConn.cpp \ $(NULL) -override NO_SHARED_LIB=1 -override NO_STATIC_LIB= +FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk