From a0097337f426526de30bd6a2794470a190c43d1c Mon Sep 17 00:00:00 2001 From: "shaver%netscape.com" Date: Tue, 15 Dec 1998 22:17:14 +0000 Subject: [PATCH] Make apprunner link dynamically. Sprinkle Makefile.ins with NO_STATIC_LIB to speed the build and reduce the disk requirements. git-svn-id: svn://10.0.0.236/trunk@16459 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/Makefile.in | 2 ++ mozilla/dom/src/build/Makefile.in | 4 +++- mozilla/dom/src/coreDOM/Makefile.in | 2 ++ mozilla/dom/src/css/Makefile.in | 2 ++ mozilla/dom/src/events/Makefile.in | 2 ++ mozilla/dom/src/html/Makefile.in | 2 ++ mozilla/lib/libpwcac/Makefile.in | 2 ++ mozilla/lib/xp/Makefile.in | 2 ++ mozilla/modules/libimg/png/Makefile.in | 2 ++ mozilla/modules/libimg/src/Makefile.in | 2 ++ mozilla/modules/libutil/Makefile.in | 2 ++ mozilla/network/cache/Makefile.in | 2 ++ mozilla/network/cache/nu/Makefile.in | 2 ++ mozilla/network/client/Makefile.in | 1 + mozilla/network/cnvts/Makefile.in | 2 ++ mozilla/network/cstream/Makefile.in | 2 ++ mozilla/network/main/Makefile.in | 2 ++ mozilla/network/mimetype/Makefile.in | 2 ++ mozilla/network/module/Makefile.in | 2 ++ mozilla/network/protocol/about/Makefile.in | 2 ++ mozilla/network/protocol/certld/Makefile.in | 2 ++ mozilla/network/protocol/dataurl/Makefile.in | 2 ++ mozilla/network/protocol/file/Makefile.in | 2 ++ mozilla/network/protocol/ftp/Makefile.in | 2 ++ mozilla/network/protocol/gopher/Makefile.in | 2 ++ mozilla/network/protocol/http/Makefile.in | 2 ++ mozilla/network/protocol/imap4/Makefile.in | 2 ++ mozilla/network/protocol/js/Makefile.in | 2 ++ mozilla/network/protocol/ldap/Makefile.in | 2 ++ mozilla/network/protocol/mailbox/Makefile.in | 2 ++ mozilla/network/protocol/marimba/Makefile.in | 2 ++ mozilla/network/protocol/nntp/Makefile.in | 2 ++ mozilla/network/protocol/pop3/Makefile.in | 2 ++ mozilla/network/protocol/remote/Makefile.in | 2 ++ mozilla/network/protocol/smtp/Makefile.in | 2 ++ mozilla/widget/src/build/Makefile.in | 2 ++ mozilla/xpfe/bootstrap/Makefile.in | 15 ++++----------- 37 files changed, 76 insertions(+), 12 deletions(-) diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 320c7aa89e7..598c92c048b 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -49,4 +49,6 @@ include $(topsrcdir)/config/config.mk MKSHLIB := +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index 8cbba9bf307..f44da940e71 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -47,6 +47,7 @@ GFX_DSO_FLAGS = $(addprefix -lgfx, $(MOZ_TOOLKIT)) BASE_DSO_FLAGS= $(addprefix -lgmbase, $(MOZ_TOOLKIT)) EXTRA_DSO_LDOPTS = \ + -L$(DIST)/bin \ -L$(DIST)/lib \ -ljsdombase_s \ -ljsdomcore_s \ @@ -55,7 +56,6 @@ EXTRA_DSO_LDOPTS = \ -ljsdomcss_s \ -ljsdomcore_s \ -ljsurl \ - -L$(DIST)/bin \ -lraptorbase \ -lraptorgfx \ $(GFX_DSO_FLAGS) \ @@ -66,4 +66,6 @@ EXTRA_DSO_LDOPTS = \ $(NSPR_LIBS) \ $(NULL) +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/coreDOM/Makefile.in b/mozilla/dom/src/coreDOM/Makefile.in index 60f2351eb09..7059d5f68f0 100644 --- a/mozilla/dom/src/coreDOM/Makefile.in +++ b/mozilla/dom/src/coreDOM/Makefile.in @@ -55,4 +55,6 @@ include $(topsrcdir)/config/config.mk MKSHLIB := +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/css/Makefile.in b/mozilla/dom/src/css/Makefile.in index 94219e83454..0419257d05f 100644 --- a/mozilla/dom/src/css/Makefile.in +++ b/mozilla/dom/src/css/Makefile.in @@ -49,4 +49,6 @@ include $(topsrcdir)/config/config.mk MKSHLIB := +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/events/Makefile.in b/mozilla/dom/src/events/Makefile.in index cd986ad79fe..15a9a3365ca 100644 --- a/mozilla/dom/src/events/Makefile.in +++ b/mozilla/dom/src/events/Makefile.in @@ -39,4 +39,6 @@ include $(topsrcdir)/config/config.mk TARGETS = $(LIBRARY) +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/html/Makefile.in b/mozilla/dom/src/html/Makefile.in index debbc9a480f..4cd4dd39c15 100644 --- a/mozilla/dom/src/html/Makefile.in +++ b/mozilla/dom/src/html/Makefile.in @@ -93,4 +93,6 @@ include $(topsrcdir)/config/config.mk MKSHLIB := +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/lib/libpwcac/Makefile.in b/mozilla/lib/libpwcac/Makefile.in index bb658798824..b58a92803d7 100644 --- a/mozilla/lib/libpwcac/Makefile.in +++ b/mozilla/lib/libpwcac/Makefile.in @@ -29,4 +29,6 @@ CSRCS = pwcacapi.c REQUIRES = js dbm img layer util pref security +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/lib/xp/Makefile.in b/mozilla/lib/xp/Makefile.in index fb302dc29d5..f24c1be320c 100644 --- a/mozilla/lib/xp/Makefile.in +++ b/mozilla/lib/xp/Makefile.in @@ -73,6 +73,8 @@ ifeq ($(MOZ_MAIL_NEWS),1) CSRCS += xp_md5.c endif +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk #EMACS = lemacs diff --git a/mozilla/modules/libimg/png/Makefile.in b/mozilla/modules/libimg/png/Makefile.in index 2df788ad9c0..79fe07d85c9 100644 --- a/mozilla/modules/libimg/png/Makefile.in +++ b/mozilla/modules/libimg/png/Makefile.in @@ -54,4 +54,6 @@ endif LOCAL_INCLUDES = -I$(srcdir) +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/modules/libimg/src/Makefile.in b/mozilla/modules/libimg/src/Makefile.in index 9179ed6d1cc..588d16a9575 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -84,6 +84,8 @@ symbols:: @echo "LIBRARY is $(LIBRARY)" @echo "DIST is $(DIST)" +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk # diff --git a/mozilla/modules/libutil/Makefile.in b/mozilla/modules/libutil/Makefile.in index 66729f99b61..d63c1e0dd0a 100644 --- a/mozilla/modules/libutil/Makefile.in +++ b/mozilla/modules/libutil/Makefile.in @@ -24,4 +24,6 @@ include $(DEPTH)/config/autoconf.mk DIRS = public src +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/cache/Makefile.in b/mozilla/network/cache/Makefile.in index a16d0c1b06c..cb14298a071 100644 --- a/mozilla/network/cache/Makefile.in +++ b/mozilla/network/cache/Makefile.in @@ -44,5 +44,7 @@ REQUIRES += \ $(NULL) endif +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/cache/nu/Makefile.in b/mozilla/network/cache/nu/Makefile.in index d9cf270a922..69399ee9ca7 100644 --- a/mozilla/network/cache/nu/Makefile.in +++ b/mozilla/network/cache/nu/Makefile.in @@ -28,4 +28,6 @@ DIRS = public src include $(topsrcdir)/config/config.mk +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/client/Makefile.in b/mozilla/network/client/Makefile.in index b8c239a9a5e..ad8778f7ce0 100644 --- a/mozilla/network/client/Makefile.in +++ b/mozilla/network/client/Makefile.in @@ -25,6 +25,7 @@ MODULE = cnetinit ifndef MODULAR_NETLIB LIBRARY_NAME = cnetinit +NO_STATIC_LIB=1 CSRCS = \ cnetinit.c \ diff --git a/mozilla/network/cnvts/Makefile.in b/mozilla/network/cnvts/Makefile.in index 78e8cc753ba..7d5a7071724 100644 --- a/mozilla/network/cnvts/Makefile.in +++ b/mozilla/network/cnvts/Makefile.in @@ -74,4 +74,6 @@ ifndef MOZ_NATIVE_ZLIB REQUIRES += zlib endif +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/cstream/Makefile.in b/mozilla/network/cstream/Makefile.in index 1899c0903a5..7120c05b3d7 100644 --- a/mozilla/network/cstream/Makefile.in +++ b/mozilla/network/cstream/Makefile.in @@ -36,5 +36,7 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) REQUIRES = network dbm util pref js java fileurl security \ layer img jtools netcnvts +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/main/Makefile.in b/mozilla/network/main/Makefile.in index 0f961a9b551..3cee009cb2e 100644 --- a/mozilla/network/main/Makefile.in +++ b/mozilla/network/main/Makefile.in @@ -85,6 +85,8 @@ ifdef MOZ_SMOOTH_PROGRESS REQUIRES += progress endif +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk TEST_LIBS = $(LIBRARY) \ diff --git a/mozilla/network/mimetype/Makefile.in b/mozilla/network/mimetype/Makefile.in index e35611aaf61..3aa361fd631 100644 --- a/mozilla/network/mimetype/Makefile.in +++ b/mozilla/network/mimetype/Makefile.in @@ -35,6 +35,8 @@ include $(topsrcdir)/config/config.mk REQUIRES = network img layer util +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk # diff --git a/mozilla/network/module/Makefile.in b/mozilla/network/module/Makefile.in index 658b780ed66..1f9e7a472d9 100644 --- a/mozilla/network/module/Makefile.in +++ b/mozilla/network/module/Makefile.in @@ -60,6 +60,8 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) include $(topsrcdir)/config/config.mk +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk $(LIBRARY): \ diff --git a/mozilla/network/protocol/about/Makefile.in b/mozilla/network/protocol/about/Makefile.in index 87ddbb4579f..d14f5609b11 100644 --- a/mozilla/network/protocol/about/Makefile.in +++ b/mozilla/network/protocol/about/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/abouturl.h REQUIRES = netcache network dbm util pref js java fileurl \ security layer img httpurl jtools +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/certld/Makefile.in b/mozilla/network/protocol/certld/Makefile.in index ac0d751ab5a..e8453dc7341 100644 --- a/mozilla/network/protocol/certld/Makefile.in +++ b/mozilla/network/protocol/certld/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/mkcertld.h REQUIRES = ldap network dbm util pref js java fileurl \ security layer img httpurl +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/dataurl/Makefile.in b/mozilla/network/protocol/dataurl/Makefile.in index 5d40f793050..99b8e88b84e 100644 --- a/mozilla/network/protocol/dataurl/Makefile.in +++ b/mozilla/network/protocol/dataurl/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/dataurl.h REQUIRES = network dbm util pref js java fileurl \ security layer img httpurl netcnvts +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/file/Makefile.in b/mozilla/network/protocol/file/Makefile.in index cde5e90b4ca..6c0777e5de0 100644 --- a/mozilla/network/protocol/file/Makefile.in +++ b/mozilla/network/protocol/file/Makefile.in @@ -38,5 +38,7 @@ ifdef MOZ_SMOOTH_PROGRESS REQUIRES += progress endif +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/ftp/Makefile.in b/mozilla/network/protocol/ftp/Makefile.in index 8bec94612ba..7a4454b663d 100644 --- a/mozilla/network/protocol/ftp/Makefile.in +++ b/mozilla/network/protocol/ftp/Makefile.in @@ -38,5 +38,7 @@ ifdef MOZ_SMOOTH_PROGRESS REQUIRES += progress endif +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/gopher/Makefile.in b/mozilla/network/protocol/gopher/Makefile.in index 6f3fe4ce2ad..b9f37660570 100644 --- a/mozilla/network/protocol/gopher/Makefile.in +++ b/mozilla/network/protocol/gopher/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/gophurl.h REQUIRES = network dbm util pref js java fileurl \ security layer img httpurl remoturl mimetype +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/http/Makefile.in b/mozilla/network/protocol/http/Makefile.in index e49e1987403..db848f2f687 100644 --- a/mozilla/network/protocol/http/Makefile.in +++ b/mozilla/network/protocol/http/Makefile.in @@ -41,5 +41,7 @@ ifdef MOZ_SMOOTH_PROGRESS REQUIRES += progress endif +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/imap4/Makefile.in b/mozilla/network/protocol/imap4/Makefile.in index 1ec3c24796d..7a50898ad03 100644 --- a/mozilla/network/protocol/imap4/Makefile.in +++ b/mozilla/network/protocol/imap4/Makefile.in @@ -45,6 +45,8 @@ REQUIRES = util network security \ netcache network nspr2 dbm util pref js java fileurl \ security layer img httpurl mimetype htmldlgs +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/lib/libmsg diff --git a/mozilla/network/protocol/js/Makefile.in b/mozilla/network/protocol/js/Makefile.in index fecb7cd5c91..98b581c567e 100644 --- a/mozilla/network/protocol/js/Makefile.in +++ b/mozilla/network/protocol/js/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/jsurl.h REQUIRES = network dbm util pref js java fileurl \ security layer img httpurl lay parse style +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/ldap/Makefile.in b/mozilla/network/protocol/ldap/Makefile.in index 52fcfd13ef7..67573476d4b 100644 --- a/mozilla/network/protocol/ldap/Makefile.in +++ b/mozilla/network/protocol/ldap/Makefile.in @@ -35,6 +35,8 @@ REQUIRES = ldap progress netcache network dbm util pref js java fileurl \ security layer img httpurl mimetype htmldlgs +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/lib/libmsg diff --git a/mozilla/network/protocol/mailbox/Makefile.in b/mozilla/network/protocol/mailbox/Makefile.in index fff3b125f6b..c775032d9c9 100644 --- a/mozilla/network/protocol/mailbox/Makefile.in +++ b/mozilla/network/protocol/mailbox/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/mkmailbx.h REQUIRES = imap4url netcache network dbm util pref js java fileurl \ security layer img httpurl mimetype htmldlgs +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/marimba/Makefile.in b/mozilla/network/protocol/marimba/Makefile.in index a24f3f4f69b..88da081d2d1 100644 --- a/mozilla/network/protocol/marimba/Makefile.in +++ b/mozilla/network/protocol/marimba/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/marimurl.h REQUIRES = network dbm util pref js java fileurl \ security layer img httpurl +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/nntp/Makefile.in b/mozilla/network/protocol/nntp/Makefile.in index 42ed4c76e99..3fff0fb03f4 100644 --- a/mozilla/network/protocol/nntp/Makefile.in +++ b/mozilla/network/protocol/nntp/Makefile.in @@ -37,5 +37,7 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) REQUIRES = netcache network dbm util pref js java fileurl \ security layer img httpurl mimetype htmldlgs +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/pop3/Makefile.in b/mozilla/network/protocol/pop3/Makefile.in index 1b4396ef666..7d97f31dec0 100644 --- a/mozilla/network/protocol/pop3/Makefile.in +++ b/mozilla/network/protocol/pop3/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/mkpop3.h REQUIRES = netcache network dbm util pref js java fileurl \ security layer img httpurl mimetype htmldlgs +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/remote/Makefile.in b/mozilla/network/protocol/remote/Makefile.in index 5d88f75b289..a8b96b7bc04 100644 --- a/mozilla/network/protocol/remote/Makefile.in +++ b/mozilla/network/protocol/remote/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/remoturl.h REQUIRES = network dbm util pref js java fileurl \ security layer img httpurl +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/network/protocol/smtp/Makefile.in b/mozilla/network/protocol/smtp/Makefile.in index 4439aeb5aee..f30d0fdfb82 100644 --- a/mozilla/network/protocol/smtp/Makefile.in +++ b/mozilla/network/protocol/smtp/Makefile.in @@ -34,5 +34,7 @@ EXPORTS= $(srcdir)/mksmtp.h REQUIRES = netcache network dbm util pref js java fileurl \ security layer img httpurl mimetype htmldlgs +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/src/build/Makefile.in b/mozilla/widget/src/build/Makefile.in index 26febb4398e..9cb075de6d7 100644 --- a/mozilla/widget/src/build/Makefile.in +++ b/mozilla/widget/src/build/Makefile.in @@ -77,4 +77,6 @@ EXTRA_DSO_LDOPTS+=\ EXTRA_DSO_LDOPTS += $(TOOLKIT_LIBS) $(XLDFLAGS) $(XLIBS) +NO_STATIC_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 54f286f6bd3..b7ab5443bd8 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -27,7 +27,7 @@ include $(topsrcdir)/config/config.mk PROGS= $(OBJDIR)/apprunner -MODULE=raptor +MODULE=apprunner REQUIRES=raptor xpcom base netlib pref js dom @@ -41,7 +41,7 @@ INCLUDES+= -I../public -I$(PUBLIC)/raptor \ EX_LIBS=\ -L$(DIST)/bin \ - $(DIST)/lib/libnsappshell.a \ + -lnsappshell \ -lxpcom \ -lraptorbase \ -lwidgetgtk \ @@ -63,15 +63,8 @@ EX_LIBS=\ -lnetwork \ -lnetlib \ -lraptorwebwidget \ - $(DIST)/lib/libraptorhtmlbase_s.a \ - $(DIST)/lib/libraptorlayout_s.a \ - $(DIST)/lib/libraptorevents_s.a \ - $(DIST)/lib/libraptorhtmlstyle_s.a \ - $(DIST)/lib/libjsdombase_s.a \ - $(DIST)/lib/libjsdomhtml_s.a \ - $(DIST)/lib/libjsdomcss_s.a \ - $(DIST)/lib/libjsdomcore_s.a \ - -ljsurl \ + -lraptorhtml \ + -ljsdom \ -lraptorbase \ -lsecfree \ -ljs \