diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 598c92c048b..320c7aa89e7 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -49,6 +49,4 @@ 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 f44da940e71..8cbba9bf307 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -47,7 +47,6 @@ 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 \ @@ -56,6 +55,7 @@ EXTRA_DSO_LDOPTS = \ -ljsdomcss_s \ -ljsdomcore_s \ -ljsurl \ + -L$(DIST)/bin \ -lraptorbase \ -lraptorgfx \ $(GFX_DSO_FLAGS) \ @@ -66,6 +66,4 @@ 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 7059d5f68f0..60f2351eb09 100644 --- a/mozilla/dom/src/coreDOM/Makefile.in +++ b/mozilla/dom/src/coreDOM/Makefile.in @@ -55,6 +55,4 @@ 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 0419257d05f..94219e83454 100644 --- a/mozilla/dom/src/css/Makefile.in +++ b/mozilla/dom/src/css/Makefile.in @@ -49,6 +49,4 @@ 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 15a9a3365ca..cd986ad79fe 100644 --- a/mozilla/dom/src/events/Makefile.in +++ b/mozilla/dom/src/events/Makefile.in @@ -39,6 +39,4 @@ 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 4cd4dd39c15..debbc9a480f 100644 --- a/mozilla/dom/src/html/Makefile.in +++ b/mozilla/dom/src/html/Makefile.in @@ -93,6 +93,4 @@ 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 b58a92803d7..bb658798824 100644 --- a/mozilla/lib/libpwcac/Makefile.in +++ b/mozilla/lib/libpwcac/Makefile.in @@ -29,6 +29,4 @@ 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 f24c1be320c..fb302dc29d5 100644 --- a/mozilla/lib/xp/Makefile.in +++ b/mozilla/lib/xp/Makefile.in @@ -73,8 +73,6 @@ 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 79fe07d85c9..2df788ad9c0 100644 --- a/mozilla/modules/libimg/png/Makefile.in +++ b/mozilla/modules/libimg/png/Makefile.in @@ -54,6 +54,4 @@ 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 588d16a9575..9179ed6d1cc 100644 --- a/mozilla/modules/libimg/src/Makefile.in +++ b/mozilla/modules/libimg/src/Makefile.in @@ -84,8 +84,6 @@ 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 d63c1e0dd0a..66729f99b61 100644 --- a/mozilla/modules/libutil/Makefile.in +++ b/mozilla/modules/libutil/Makefile.in @@ -24,6 +24,4 @@ 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 cb14298a071..a16d0c1b06c 100644 --- a/mozilla/network/cache/Makefile.in +++ b/mozilla/network/cache/Makefile.in @@ -44,7 +44,5 @@ 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 69399ee9ca7..d9cf270a922 100644 --- a/mozilla/network/cache/nu/Makefile.in +++ b/mozilla/network/cache/nu/Makefile.in @@ -28,6 +28,4 @@ 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 ad8778f7ce0..b8c239a9a5e 100644 --- a/mozilla/network/client/Makefile.in +++ b/mozilla/network/client/Makefile.in @@ -25,7 +25,6 @@ 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 7d5a7071724..78e8cc753ba 100644 --- a/mozilla/network/cnvts/Makefile.in +++ b/mozilla/network/cnvts/Makefile.in @@ -74,6 +74,4 @@ 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 7120c05b3d7..1899c0903a5 100644 --- a/mozilla/network/cstream/Makefile.in +++ b/mozilla/network/cstream/Makefile.in @@ -36,7 +36,5 @@ 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 3cee009cb2e..0f961a9b551 100644 --- a/mozilla/network/main/Makefile.in +++ b/mozilla/network/main/Makefile.in @@ -85,8 +85,6 @@ 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 3aa361fd631..e35611aaf61 100644 --- a/mozilla/network/mimetype/Makefile.in +++ b/mozilla/network/mimetype/Makefile.in @@ -35,8 +35,6 @@ 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 1f9e7a472d9..658b780ed66 100644 --- a/mozilla/network/module/Makefile.in +++ b/mozilla/network/module/Makefile.in @@ -60,8 +60,6 @@ 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 d14f5609b11..87ddbb4579f 100644 --- a/mozilla/network/protocol/about/Makefile.in +++ b/mozilla/network/protocol/about/Makefile.in @@ -34,7 +34,5 @@ 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 e8453dc7341..ac0d751ab5a 100644 --- a/mozilla/network/protocol/certld/Makefile.in +++ b/mozilla/network/protocol/certld/Makefile.in @@ -34,7 +34,5 @@ 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 99b8e88b84e..5d40f793050 100644 --- a/mozilla/network/protocol/dataurl/Makefile.in +++ b/mozilla/network/protocol/dataurl/Makefile.in @@ -34,7 +34,5 @@ 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 6c0777e5de0..cde5e90b4ca 100644 --- a/mozilla/network/protocol/file/Makefile.in +++ b/mozilla/network/protocol/file/Makefile.in @@ -38,7 +38,5 @@ 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 7a4454b663d..8bec94612ba 100644 --- a/mozilla/network/protocol/ftp/Makefile.in +++ b/mozilla/network/protocol/ftp/Makefile.in @@ -38,7 +38,5 @@ 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 b9f37660570..6f3fe4ce2ad 100644 --- a/mozilla/network/protocol/gopher/Makefile.in +++ b/mozilla/network/protocol/gopher/Makefile.in @@ -34,7 +34,5 @@ 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 db848f2f687..e49e1987403 100644 --- a/mozilla/network/protocol/http/Makefile.in +++ b/mozilla/network/protocol/http/Makefile.in @@ -41,7 +41,5 @@ 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 7a50898ad03..1ec3c24796d 100644 --- a/mozilla/network/protocol/imap4/Makefile.in +++ b/mozilla/network/protocol/imap4/Makefile.in @@ -45,8 +45,6 @@ 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 98b581c567e..fecb7cd5c91 100644 --- a/mozilla/network/protocol/js/Makefile.in +++ b/mozilla/network/protocol/js/Makefile.in @@ -34,7 +34,5 @@ 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 67573476d4b..52fcfd13ef7 100644 --- a/mozilla/network/protocol/ldap/Makefile.in +++ b/mozilla/network/protocol/ldap/Makefile.in @@ -35,8 +35,6 @@ 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 c775032d9c9..fff3b125f6b 100644 --- a/mozilla/network/protocol/mailbox/Makefile.in +++ b/mozilla/network/protocol/mailbox/Makefile.in @@ -34,7 +34,5 @@ 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 88da081d2d1..a24f3f4f69b 100644 --- a/mozilla/network/protocol/marimba/Makefile.in +++ b/mozilla/network/protocol/marimba/Makefile.in @@ -34,7 +34,5 @@ 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 3fff0fb03f4..42ed4c76e99 100644 --- a/mozilla/network/protocol/nntp/Makefile.in +++ b/mozilla/network/protocol/nntp/Makefile.in @@ -37,7 +37,5 @@ 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 7d97f31dec0..1b4396ef666 100644 --- a/mozilla/network/protocol/pop3/Makefile.in +++ b/mozilla/network/protocol/pop3/Makefile.in @@ -34,7 +34,5 @@ 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 a8b96b7bc04..5d88f75b289 100644 --- a/mozilla/network/protocol/remote/Makefile.in +++ b/mozilla/network/protocol/remote/Makefile.in @@ -34,7 +34,5 @@ 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 f30d0fdfb82..4439aeb5aee 100644 --- a/mozilla/network/protocol/smtp/Makefile.in +++ b/mozilla/network/protocol/smtp/Makefile.in @@ -34,7 +34,5 @@ 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 9cb075de6d7..26febb4398e 100644 --- a/mozilla/widget/src/build/Makefile.in +++ b/mozilla/widget/src/build/Makefile.in @@ -77,6 +77,4 @@ 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 b7ab5443bd8..aa64c64c0bb 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=apprunner +MODULE=raptor REQUIRES=raptor xpcom base netlib pref js dom @@ -41,7 +41,7 @@ INCLUDES+= -I../public -I$(PUBLIC)/raptor \ EX_LIBS=\ -L$(DIST)/bin \ - -lnsappshell \ + $(DIST)/lib/libnsappshell.a \ -lxpcom \ -lraptorbase \ -lwidgetgtk \ @@ -63,8 +63,15 @@ EX_LIBS=\ -lnetwork \ -lnetlib \ -lraptorwebwidget \ - -lraptorhtml \ - -ljsdom \ + $(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 \ -lraptorbase \ -lsecfree \ -ljs \ @@ -101,7 +108,7 @@ include $(topsrcdir)/config/rules.mk $(PROGS) : $(OBJS) @$(MAKE_OBJDIR) - $(CCC) -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) + $(CCC) -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) $(TK_GTK_LIBS) install:: $(TARGETS) $(INSTALL) $(PROGS) $(DIST)/bin