resprinkle NO_STATIC_LIB, but spare libpng so that viewer is cool. Also, repair some viewer/apprunner link foibles

1998-12-18 02:55:23 +00:00 · 1998-12-18 02:55:23 +00:00 · 009626137f
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -49,4 +49,6 @@ include $(topsrcdir)/config/config.mk

 MKSHLIB :=

+NO_SHARED_LIB=1
+
 include $(topsrcdir)/config/rules.mk
--- a/dom/src/build/Makefile.in
+++ b/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
--- a/dom/src/coreDOM/Makefile.in
+++ b/dom/src/coreDOM/Makefile.in
@ -55,4 +55,6 @@ include $(topsrcdir)/config/config.mk

 MKSHLIB :=

+NO_SHARED_LIB=1
+
 include $(topsrcdir)/config/rules.mk
--- a/dom/src/css/Makefile.in
+++ b/dom/src/css/Makefile.in
@ -49,4 +49,6 @@ include $(topsrcdir)/config/config.mk

 MKSHLIB :=

+NO_SHARED_LIB=1
+
 include $(topsrcdir)/config/rules.mk
--- a/dom/src/events/Makefile.in
+++ b/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
--- a/dom/src/html/Makefile.in
+++ b/dom/src/html/Makefile.in
@ -93,4 +93,6 @@ include $(topsrcdir)/config/config.mk

 MKSHLIB :=

+NO_SHARED_LIB=1
+
 include $(topsrcdir)/config/rules.mk
--- a/lib/libpwcac/Makefile.in
+++ b/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
--- a/lib/xp/Makefile.in
+++ b/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
--- a/modules/libimg/src/Makefile.in
+++ b/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

 #
--- a/modules/libutil/Makefile.in
+++ b/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
--- a/network/cache/Makefile.in
+++ b/network/cache/Makefile.in
@ -44,5 +44,7 @@ REQUIRES += \
 	$(NULL)
 endif

+NO_STATIC_LIB=1
+
 include $(topsrcdir)/config/rules.mk

--- a/network/cache/nu/Makefile.in
+++ b/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
--- a/network/client/Makefile.in
+++ b/network/client/Makefile.in
@ -25,6 +25,7 @@ MODULE		= cnetinit

 ifndef MODULAR_NETLIB
 LIBRARY_NAME	= cnetinit
+NO_STATIC_LIB=1

 CSRCS		= \
 	cnetinit.c	\
--- a/network/cnvts/Makefile.in
+++ b/network/cnvts/Makefile.in
@ -74,4 +74,6 @@ ifndef MOZ_NATIVE_ZLIB
 REQUIRES	+= zlib
 endif

+NO_STATIC_LIB=1
+
 include $(topsrcdir)/config/rules.mk
--- a/network/cstream/Makefile.in
+++ b/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

--- a/network/main/Makefile.in
+++ b/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) \
--- a/network/mimetype/Makefile.in
+++ b/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

 #
--- a/network/module/Makefile.in
+++ b/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): \
--- a/network/protocol/about/Makefile.in
+++ b/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

--- a/network/protocol/certld/Makefile.in
+++ b/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

--- a/network/protocol/dataurl/Makefile.in
+++ b/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

--- a/network/protocol/file/Makefile.in
+++ b/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

--- a/network/protocol/ftp/Makefile.in
+++ b/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

--- a/network/protocol/gopher/Makefile.in
+++ b/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

--- a/network/protocol/http/Makefile.in
+++ b/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

--- a/network/protocol/imap4/Makefile.in
+++ b/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
--- a/network/protocol/js/Makefile.in
+++ b/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

--- a/network/protocol/ldap/Makefile.in
+++ b/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
--- a/network/protocol/mailbox/Makefile.in
+++ b/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

--- a/network/protocol/marimba/Makefile.in
+++ b/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

--- a/network/protocol/nntp/Makefile.in
+++ b/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

--- a/network/protocol/pop3/Makefile.in
+++ b/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

--- a/network/protocol/remote/Makefile.in
+++ b/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

--- a/network/protocol/smtp/Makefile.in
+++ b/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

--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -101,7 +101,6 @@ EX_LIBS = \
 	-lraptorgfx \
 	$(TOOLKIT_GFX_LIB) \
 	-lraptorhtml \
-	$(DIST)/lib/libraptorhtmlforms_s.a \
 	$(TOOLKIT_BASE_LIB) \
 	-lraptorhtmlpars \
 	-lraptorview \
@ -116,7 +115,7 @@ EX_LIBS = \
 	$(PNG_LIBS) \
 	-ljs \
 	-ljsdom \
-	$(DIST)/lib/libjsdomcore_s.a \
+	-ljsurl \
 	$(JSJ_LIB) \
 	-lmimetype \
 	-lnetcache \
--- a/widget/src/build/Makefile.in
+++ b/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
--- a/xpfe/bootstrap/Makefile.in
+++ b/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		\
@ -108,7 +101,7 @@ include $(topsrcdir)/config/rules.mk

 $(PROGS) : $(OBJS)
 	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) $(TK_GTK_LIBS)
+	$(CCC) -o $@ $(OBJS) $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)

 install:: $(TARGETS)
 	$(INSTALL) $(PROGS) $(DIST)/bin