From 9e90a706715f246eaad0e9d9912e6b727b0b71d2 Mon Sep 17 00:00:00 2001 From: "shaver%netscape.com" Date: Tue, 15 Dec 1998 16:32:37 +0000 Subject: [PATCH] Add --enable-debug=module1,module2 to selective turn on debugging. Remove --enable-dom, because Mariner is dead (sob). Rename some MODULE= lines to make the afore-mentioned --enable-debug technique actually useful. Feel free to recategorize. Fix libraptorhtml.so link bogosity by disabling shared lib generation for the sub-archives (libraptor*_s.a), so that we can put bin before lib in the library path and still get the right effect. We could disable static-lib generation in most other places and cut the build time down a fair bit, too. [NOTE: I'm getting on a train...msw@gimp.org has agreed to be my tinderbox buddy. Thanks, Matt!] git-svn-id: svn://10.0.0.236/trunk@16441 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/public/Makefile.in | 2 +- mozilla/base/src/Makefile.in | 2 +- mozilla/base/src/gtk/Makefile.in | 2 +- mozilla/base/src/motif/Makefile.in | 2 +- mozilla/base/src/rhapsody/Makefile.in | 2 +- mozilla/config/autoconf.mk.in | 1 + mozilla/config/config.mk | 5 +++++ mozilla/configure.in | 10 +++------- mozilla/content/events/public/Makefile.in | 2 +- mozilla/content/events/src/Makefile.in | 2 +- mozilla/content/html/content/public/Makefile.in | 2 +- mozilla/content/html/content/src/Makefile.in | 5 ++++- mozilla/content/xml/content/public/Makefile.in | 2 +- mozilla/content/xml/content/src/Makefile.in | 5 ++++- mozilla/content/xml/document/public/Makefile.in | 2 +- mozilla/content/xml/document/src/Makefile.in | 5 ++++- mozilla/dom/src/base/Makefile.in | 2 +- mozilla/dom/src/build/Makefile.in | 2 +- 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/htmlparser/src/Makefile.in | 2 +- mozilla/layout/base/public/Makefile.in | 2 +- mozilla/layout/base/src/Makefile.in | 5 ++++- mozilla/layout/build/Makefile.in | 6 +++--- mozilla/layout/events/public/Makefile.in | 2 +- mozilla/layout/events/src/Makefile.in | 2 +- mozilla/layout/html/base/src/Makefile.in | 5 ++++- mozilla/layout/html/content/public/Makefile.in | 2 +- mozilla/layout/html/content/src/Makefile.in | 5 ++++- mozilla/layout/html/document/src/Makefile.in | 5 ++++- mozilla/layout/html/forms/public/Makefile.in | 2 +- mozilla/layout/html/forms/src/Makefile.in | 5 ++++- mozilla/layout/html/style/public/Makefile.in | 2 +- mozilla/layout/html/style/src/Makefile.in | 5 ++++- mozilla/layout/html/table/src/Makefile.in | 5 ++++- mozilla/layout/xml/content/public/Makefile.in | 2 +- mozilla/layout/xml/content/src/Makefile.in | 5 ++++- mozilla/layout/xml/document/public/Makefile.in | 2 +- mozilla/layout/xml/document/src/Makefile.in | 5 ++++- mozilla/parser/htmlparser/src/Makefile.in | 2 +- mozilla/widget/src/gtk/Makefile.in | 2 +- mozilla/widget/src/motif/Makefile.in | 2 +- mozilla/widget/src/rhapsody/Makefile.in | 2 +- mozilla/widget/src/xpwidgets/Makefile.in | 2 +- 46 files changed, 90 insertions(+), 52 deletions(-) diff --git a/mozilla/base/public/Makefile.in b/mozilla/base/public/Makefile.in index ef0af92da21..e0965cd74aa 100644 --- a/mozilla/base/public/Makefile.in +++ b/mozilla/base/public/Makefile.in @@ -30,7 +30,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=base include $(topsrcdir)/config/config.mk diff --git a/mozilla/base/src/Makefile.in b/mozilla/base/src/Makefile.in index 18fc2da81ac..908bd0c37a0 100644 --- a/mozilla/base/src/Makefile.in +++ b/mozilla/base/src/Makefile.in @@ -68,7 +68,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=base REQUIRES = xpcom netlib raptor diff --git a/mozilla/base/src/gtk/Makefile.in b/mozilla/base/src/gtk/Makefile.in index 33005c8cdce..1f76787cdf4 100644 --- a/mozilla/base/src/gtk/Makefile.in +++ b/mozilla/base/src/gtk/Makefile.in @@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gmbasegtk -MODULE = raptor +MODULE=base REQUIRES = xpcom raptor diff --git a/mozilla/base/src/motif/Makefile.in b/mozilla/base/src/motif/Makefile.in index b0f035c391c..8d73a58680d 100644 --- a/mozilla/base/src/motif/Makefile.in +++ b/mozilla/base/src/motif/Makefile.in @@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gmbasemotif -MODULE = raptor +MODULE=base REQUIRES = xpcom raptor diff --git a/mozilla/base/src/rhapsody/Makefile.in b/mozilla/base/src/rhapsody/Makefile.in index 126d61fdda9..10a5457fbcf 100644 --- a/mozilla/base/src/rhapsody/Makefile.in +++ b/mozilla/base/src/rhapsody/Makefile.in @@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gmbaseunix -MODULE=raptor +MODULE=base REQUIRES=xpcom raptor diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 8a42dd45b23..5478c6c8b7a 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -26,6 +26,7 @@ MOZ_JAVA = @MOZ_JAVA@ MOZ_OJI = @MOZ_OJI@ MOZ_NETCAST = @MOZ_NETCAST@ MOZ_DEBUG = @MOZ_DEBUG@ +MOZ_DEBUG_MODULES = @MOZ_DEBUG_MODULES@ MOZILLA_GPROF = @MOZILLA_GPROF@ BUILD_PROFILE = @MOZILLA_GPROF@ MOZ_DARK = @MOZ_DARK@ diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 78a0c3312f1..9c355a2206c 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -119,6 +119,11 @@ endif OS_CONFIG := $(OS_ARCH)$(OS_RELEASE) +ifneq (, $(filter $(MODULE), $(MOZ_DEBUG_MODULES))) + MOZ_DEBUG=1 + CFLAGS="$CFLAGS -g" +endif + # # Personal makefile customizations go in these optional make include files. # diff --git a/mozilla/configure.in b/mozilla/configure.in index 91e08d6da8f..83deb5d8c18 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -430,6 +430,8 @@ AC_ARG_ENABLE(debug, [ --enable-debug enable debug symbols], [if test "$enableval" = yes; then MOZ_DEBUG=1 CFLAGS="$CFLAGS -g" + else + MOZ_DEBUG_MODULES=`echo $enableval | sed 's|,| |g'` fi] ) AC_ARG_ENABLE(profile, @@ -484,13 +486,6 @@ AC_ARG_ENABLE(smart-mail, MOZ_SMART_MAIL=1 fi]) -AC_ARG_ENABLE(dom, -[ --enable-dom enable Level-1 Document Object Model support ], - [if test "$enableval" = "yes"; then - AC_DEFINE(DOM) - MOZ_DOM=1 - fi] ) - AC_ARG_ENABLE(mail-compose, [ --enable-mail-compose enable old Messenger mail composer ], [if test "$enableval" = "yes"; then @@ -518,6 +513,7 @@ AC_SUBST(MOZ_NETCAST) AC_SUBST(MOZ_JAVA) AC_SUBST(MOZ_OJI) AC_SUBST(MOZ_DEBUG) +AC_SUBST(MOZ_DEBUG_MODULES) AC_SUBST(MOZILLA_GPROF) AC_SUBST(MOZ_DARK) AC_SUBST(MOZ_EDITOR) diff --git a/mozilla/content/events/public/Makefile.in b/mozilla/content/events/public/Makefile.in index 57f3ba0fab6..a1bebfe1205 100644 --- a/mozilla/content/events/public/Makefile.in +++ b/mozilla/content/events/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nsIEventListenerManager.h \ diff --git a/mozilla/content/events/src/Makefile.in b/mozilla/content/events/src/Makefile.in index a854a145a81..2daf92c43f8 100644 --- a/mozilla/content/events/src/Makefile.in +++ b/mozilla/content/events/src/Makefile.in @@ -33,7 +33,7 @@ CPPSRCS = \ nsDOMEventsIIDs.cpp \ $(NULL) -MODULE = raptor +MODULE=layout EXPORTS = \ nsEventListenerManager.h \ diff --git a/mozilla/content/html/content/public/Makefile.in b/mozilla/content/html/content/public/Makefile.in index 5bd99934d6f..fbea75e448e 100644 --- a/mozilla/content/html/content/public/Makefile.in +++ b/mozilla/content/html/content/public/Makefile.in @@ -29,7 +29,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout include $(topsrcdir)/config/config.mk diff --git a/mozilla/content/html/content/src/Makefile.in b/mozilla/content/html/content/src/Makefile.in index d3750191866..7c2d4dec85b 100644 --- a/mozilla/content/html/content/src/Makefile.in +++ b/mozilla/content/html/content/src/Makefile.in @@ -94,7 +94,7 @@ CPPSRCS= \ nsTextNode.cpp \ $(NULL) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom js netlib @@ -107,4 +107,7 @@ INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../../base/src \ MKSLIB := +# we don't want to build the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xml/content/public/Makefile.in b/mozilla/content/xml/content/public/Makefile.in index 0e758f1dda2..44917e03d98 100644 --- a/mozilla/content/xml/content/public/Makefile.in +++ b/mozilla/content/xml/content/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nsIXMLContent.h \ diff --git a/mozilla/content/xml/content/src/Makefile.in b/mozilla/content/xml/content/src/Makefile.in index eb0ab814b59..d3d6306fdbf 100644 --- a/mozilla/content/xml/content/src/Makefile.in +++ b/mozilla/content/xml/content/src/Makefile.in @@ -46,12 +46,15 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom netlib js pref MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/content/xml/document/public/Makefile.in b/mozilla/content/xml/document/public/Makefile.in index cae710f1ce6..ca8b7f41b91 100644 --- a/mozilla/content/xml/document/public/Makefile.in +++ b/mozilla/content/xml/document/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nsIXMLContentSink.h \ diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in index 05dd96c9d7b..bc8ffdd4384 100644 --- a/mozilla/content/xml/document/src/Makefile.in +++ b/mozilla/content/xml/document/src/Makefile.in @@ -47,12 +47,15 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom netlib js pref MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/dom/src/base/Makefile.in b/mozilla/dom/src/base/Makefile.in index 33068834151..320c7aa89e7 100644 --- a/mozilla/dom/src/base/Makefile.in +++ b/mozilla/dom/src/base/Makefile.in @@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdombase_s -MODULE = raptor +MODULE=dom REQUIRES = xpcom raptor dom js netlib diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index 578ddc2fa46..8cbba9bf307 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -28,7 +28,7 @@ CFLAGS += -D_IMPL_NS_DOM LIBRARY_NAME = jsdom -MODULE=raptor +MODULE=dom REQUIRES=xpcom raptor diff --git a/mozilla/dom/src/coreDOM/Makefile.in b/mozilla/dom/src/coreDOM/Makefile.in index 5874c4c486d..60f2351eb09 100644 --- a/mozilla/dom/src/coreDOM/Makefile.in +++ b/mozilla/dom/src/coreDOM/Makefile.in @@ -47,7 +47,7 @@ CPPSRCS = \ DEFINES += -D_IMPL_NS_DOM -MODULE = raptor +MODULE=dom REQUIRES = xpcom raptor dom js netlib diff --git a/mozilla/dom/src/css/Makefile.in b/mozilla/dom/src/css/Makefile.in index 44aa5d399a5..94219e83454 100644 --- a/mozilla/dom/src/css/Makefile.in +++ b/mozilla/dom/src/css/Makefile.in @@ -41,7 +41,7 @@ CPPSRCS = \ DEFINES += -D_IMPL_NS_DOM -MODULE = raptor +MODULE=dom REQUIRES = xpcom raptor dom js netlib diff --git a/mozilla/dom/src/events/Makefile.in b/mozilla/dom/src/events/Makefile.in index e02edb96be1..cd986ad79fe 100644 --- a/mozilla/dom/src/events/Makefile.in +++ b/mozilla/dom/src/events/Makefile.in @@ -31,7 +31,7 @@ CPPSRCS = \ nsJSEvent.cpp \ $(NULL) -MODULE = raptor +MODULE=dom REQUIRES = xpcom raptor dom js diff --git a/mozilla/dom/src/html/Makefile.in b/mozilla/dom/src/html/Makefile.in index 6affe6592e0..debbc9a480f 100644 --- a/mozilla/dom/src/html/Makefile.in +++ b/mozilla/dom/src/html/Makefile.in @@ -85,7 +85,7 @@ CPPSRCS = \ DEFINES += -D_IMPL_NS_DOM -MODULE = raptor +MODULE=dom REQUIRES = xpcom raptor dom js netlib diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in index 60063d9b037..36bffaf1aac 100644 --- a/mozilla/htmlparser/src/Makefile.in +++ b/mozilla/htmlparser/src/Makefile.in @@ -84,7 +84,7 @@ EXPORTS += $(EXTRA_EXPORTS) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=htmlparser REQUIRES = xpcom netlib raptor diff --git a/mozilla/layout/base/public/Makefile.in b/mozilla/layout/base/public/Makefile.in index 96ff0238653..ff50c569ee0 100644 --- a/mozilla/layout/base/public/Makefile.in +++ b/mozilla/layout/base/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nslayout.h \ diff --git a/mozilla/layout/base/src/Makefile.in b/mozilla/layout/base/src/Makefile.in index a8e7bfbe1ea..855eb624560 100644 --- a/mozilla/layout/base/src/Makefile.in +++ b/mozilla/layout/base/src/Makefile.in @@ -51,7 +51,7 @@ CPPSRCS = \ nsLayoutAtoms.cpp \ $(NULL) -MODULE = raptor +MODULE=layout EXPORTS = \ nsDocument.h \ @@ -70,4 +70,7 @@ TARGETS = $(LIBRARY) MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index e8b06f135ec..76dbf31af05 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -28,7 +28,7 @@ DEFINES += -D_IMPL_NS_HTML LIBRARY_NAME = raptorhtml -MODULE=raptor +MODULE=layout REQUIRES=xpcom raptor dom js @@ -47,7 +47,8 @@ endif BASE_DSO_FLAGS = $(addprefix -lgmbase, $(MOZ_TOOLKIT)) EXTRA_DSO_LDOPTS = \ - -L$(DIST)/lib \ + -L$(DIST)/bin \ + -L$(DIST)/lib \ -lraptorhtmldoc_s \ -lnglhtmlcon_s \ -lraptorhtmlstyle_s \ @@ -59,7 +60,6 @@ EXTRA_DSO_LDOPTS = \ -lraptorxmlcontent_s \ -lraptorlayout_s \ -lraptorevents_s \ - -L$(DIST)/bin \ -lraptorhtmlpars \ -lraptorgfx \ -lraptorbase \ diff --git a/mozilla/layout/events/public/Makefile.in b/mozilla/layout/events/public/Makefile.in index 57f3ba0fab6..a1bebfe1205 100644 --- a/mozilla/layout/events/public/Makefile.in +++ b/mozilla/layout/events/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nsIEventListenerManager.h \ diff --git a/mozilla/layout/events/src/Makefile.in b/mozilla/layout/events/src/Makefile.in index a854a145a81..2daf92c43f8 100644 --- a/mozilla/layout/events/src/Makefile.in +++ b/mozilla/layout/events/src/Makefile.in @@ -33,7 +33,7 @@ CPPSRCS = \ nsDOMEventsIIDs.cpp \ $(NULL) -MODULE = raptor +MODULE=layout EXPORTS = \ nsEventListenerManager.h \ diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in index e5da5391ff7..beb986971dd 100644 --- a/mozilla/layout/html/base/src/Makefile.in +++ b/mozilla/layout/html/base/src/Makefile.in @@ -70,7 +70,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom netlib plugin java js oji pref @@ -82,6 +82,9 @@ INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../content/src -I$(srcdir MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk install:: diff --git a/mozilla/layout/html/content/public/Makefile.in b/mozilla/layout/html/content/public/Makefile.in index 5bd99934d6f..fbea75e448e 100644 --- a/mozilla/layout/html/content/public/Makefile.in +++ b/mozilla/layout/html/content/public/Makefile.in @@ -29,7 +29,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout include $(topsrcdir)/config/config.mk diff --git a/mozilla/layout/html/content/src/Makefile.in b/mozilla/layout/html/content/src/Makefile.in index d3750191866..7c2d4dec85b 100644 --- a/mozilla/layout/html/content/src/Makefile.in +++ b/mozilla/layout/html/content/src/Makefile.in @@ -94,7 +94,7 @@ CPPSRCS= \ nsTextNode.cpp \ $(NULL) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom js netlib @@ -107,4 +107,7 @@ INCLUDES += -I$(srcdir)/../../style/src -I$(srcdir)/../../../base/src \ MKSLIB := +# we don't want to build the shared lib +NO_SHARED_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 83a4a028bff..cb8bbb5b03e 100644 --- a/mozilla/layout/html/document/src/Makefile.in +++ b/mozilla/layout/html/document/src/Makefile.in @@ -59,12 +59,15 @@ INCLUDES += \ -I$(srcdir)/../../style/src -I$(srcdir)/../../table/src \ -I$(srcdir)/../../../base/src -I$(srcdir)/../../content/src -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom netlib js pref MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/html/forms/public/Makefile.in b/mozilla/layout/html/forms/public/Makefile.in index 9b1ed5ff43f..0dfc46ae2e1 100644 --- a/mozilla/layout/html/forms/public/Makefile.in +++ b/mozilla/layout/html/forms/public/Makefile.in @@ -28,7 +28,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout include $(topsrcdir)/config/config.mk diff --git a/mozilla/layout/html/forms/src/Makefile.in b/mozilla/layout/html/forms/src/Makefile.in index 7f347b368e7..22d0e85971f 100644 --- a/mozilla/layout/html/forms/src/Makefile.in +++ b/mozilla/layout/html/forms/src/Makefile.in @@ -45,7 +45,7 @@ CPPSRCS = \ nsImageControlFrame.cpp \ $(NULL) -MODULE = raptor +MODULE=layout INCLUDES += -I$(srcdir)/../../../base/src -I$(srcdir)/../../base/src \ -I$(srcdir)/../../style/src -I$(srcdir)/../../content/src @@ -54,5 +54,8 @@ REQUIRES = xpcom raptor dom netlib js MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/html/style/public/Makefile.in b/mozilla/layout/html/style/public/Makefile.in index 7cd778d73df..df97c900280 100644 --- a/mozilla/layout/html/style/public/Makefile.in +++ b/mozilla/layout/html/style/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nsCSSAtoms.h \ diff --git a/mozilla/layout/html/style/src/Makefile.in b/mozilla/layout/html/style/src/Makefile.in index b52182f6eec..6b11b533483 100644 --- a/mozilla/layout/html/style/src/Makefile.in +++ b/mozilla/layout/html/style/src/Makefile.in @@ -63,7 +63,7 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout INCLUDES += -I$(srcdir)/../../base/src -I$(srcdir)/../../../base/src \ -I$(srcdir)/../../table/src -I$(srcdir)/../../content/src -I$(srcdir)/. @@ -72,5 +72,8 @@ REQUIRES = xpcom raptor dom netlib js MKSHLIB := +# we don't want the shared lib +NO_SHARED_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 ed3f2eb443d..f7fa96788fe 100644 --- a/mozilla/layout/html/table/src/Makefile.in +++ b/mozilla/layout/html/table/src/Makefile.in @@ -40,7 +40,7 @@ CPPSRCS = \ nsTableRowGroupFrame.cpp \ $(NULL) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom js netlib @@ -51,4 +51,7 @@ DEFINES += -D_IMPL_NS_HTML MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/xml/content/public/Makefile.in b/mozilla/layout/xml/content/public/Makefile.in index 0e758f1dda2..44917e03d98 100644 --- a/mozilla/layout/xml/content/public/Makefile.in +++ b/mozilla/layout/xml/content/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nsIXMLContent.h \ diff --git a/mozilla/layout/xml/content/src/Makefile.in b/mozilla/layout/xml/content/src/Makefile.in index eb0ab814b59..d3d6306fdbf 100644 --- a/mozilla/layout/xml/content/src/Makefile.in +++ b/mozilla/layout/xml/content/src/Makefile.in @@ -46,12 +46,15 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom netlib js pref MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/xml/document/public/Makefile.in b/mozilla/layout/xml/document/public/Makefile.in index cae710f1ce6..ca8b7f41b91 100644 --- a/mozilla/layout/xml/document/public/Makefile.in +++ b/mozilla/layout/xml/document/public/Makefile.in @@ -22,7 +22,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = raptor +MODULE=layout EXPORTS = \ nsIXMLContentSink.h \ diff --git a/mozilla/layout/xml/document/src/Makefile.in b/mozilla/layout/xml/document/src/Makefile.in index 05dd96c9d7b..bc8ffdd4384 100644 --- a/mozilla/layout/xml/document/src/Makefile.in +++ b/mozilla/layout/xml/document/src/Makefile.in @@ -47,12 +47,15 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=layout REQUIRES = xpcom raptor dom netlib js pref MKSHLIB := +# we don't want the shared lib +NO_SHARED_LIB=1 + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index 60063d9b037..36bffaf1aac 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/parser/htmlparser/src/Makefile.in @@ -84,7 +84,7 @@ EXPORTS += $(EXTRA_EXPORTS) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -MODULE = raptor +MODULE=htmlparser REQUIRES = xpcom netlib raptor diff --git a/mozilla/widget/src/gtk/Makefile.in b/mozilla/widget/src/gtk/Makefile.in index 19b55ebe2e2..af6aa4d5759 100644 --- a/mozilla/widget/src/gtk/Makefile.in +++ b/mozilla/widget/src/gtk/Makefile.in @@ -27,7 +27,7 @@ include $(topsrcdir)/config/config.mk LIBRARY_NAME = raptorwidgetgtk_s -MODULE=raptor +MODULE=widget REQUIRES=util img xpcom raptor netlib diff --git a/mozilla/widget/src/motif/Makefile.in b/mozilla/widget/src/motif/Makefile.in index 537274addfa..307abcd6d29 100644 --- a/mozilla/widget/src/motif/Makefile.in +++ b/mozilla/widget/src/motif/Makefile.in @@ -27,7 +27,7 @@ include $(topsrcdir)/config/config.mk LIBRARY_NAME = raptorwidgetmotif_s -MODULE=raptor +MODULE=widget REQUIRES=util img xpcom raptor netlib diff --git a/mozilla/widget/src/rhapsody/Makefile.in b/mozilla/widget/src/rhapsody/Makefile.in index c74c834ae85..4229d1014be 100644 --- a/mozilla/widget/src/rhapsody/Makefile.in +++ b/mozilla/widget/src/rhapsody/Makefile.in @@ -27,7 +27,7 @@ include $(topsrcdir)/config/config.mk LIBRARY_NAME = widgetunix -MODULE=raptor +MODULE=widget REQUIRES=util img xpcom raptor netlib diff --git a/mozilla/widget/src/xpwidgets/Makefile.in b/mozilla/widget/src/xpwidgets/Makefile.in index 47f4003ca31..821a348bc5a 100644 --- a/mozilla/widget/src/xpwidgets/Makefile.in +++ b/mozilla/widget/src/xpwidgets/Makefile.in @@ -54,7 +54,7 @@ CPPSRCS=nsBaseWidget.cpp \ nsTreeView.cpp \ $(NULL) -MODULE=raptor +MODULE=widget REQUIRES=util img xpcom raptor netlib dom js