backing out Shaver's changes. -donm

git-svn-id: svn://10.0.0.236/trunk@16472 18797224-902f-48f8-a5cc-f745e15eee43
1998-12-16 00:49:36 +00:00
parent 35b781edaa
commit aa2eff126c
37 changed files with 13 additions and 77 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

 #
--- 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
--- 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

--- 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
--- 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	\
--- 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
--- 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

--- 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) \
--- 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

 #
--- 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): \
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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