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!]
1998-12-15 16:32:37 +00:00 · 1998-12-15 16:32:37 +00:00 · 2e1488cb9a
--- a/base/public/Makefile.in
+++ b/base/public/Makefile.in
@ -30,7 +30,7 @@ EXPORTS =		\

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-MODULE = raptor
+MODULE=base

 include $(topsrcdir)/config/config.mk

--- a/base/src/Makefile.in
+++ b/base/src/Makefile.in
@ -68,7 +68,7 @@ EXPORTS =                       \

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-MODULE = raptor
+MODULE=base

 REQUIRES = xpcom netlib raptor

--- a/base/src/gtk/Makefile.in
+++ b/base/src/gtk/Makefile.in
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gmbasegtk

-MODULE		= raptor
+MODULE=base

 REQUIRES	= xpcom raptor

--- a/base/src/motif/Makefile.in
+++ b/base/src/motif/Makefile.in
@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gmbasemotif

-MODULE		= raptor
+MODULE=base

 REQUIRES	= xpcom raptor 

--- a/base/src/rhapsody/Makefile.in
+++ b/base/src/rhapsody/Makefile.in
@ -1,47 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-
-DEPTH = ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME = gmbaseunix
-
-MODULE=raptor
-
-REQUIRES=xpcom raptor 
-
-DEFINES += -D_IMPL_NS_WIDGET 
-
-CPPSRCS= \
-	nsTimer.cpp 
-
-CPP_OBJS=				\
- ./$(OBJDIR)/nsTimer.o		\
- $(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-TARGETS = $(LIBRARY)
-
-include $(topsrcdir)/config/rules.mk
-
-
--- a/config/autoconf.mk.in
+++ b/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@
--- a/config/config.mk
+++ b/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.
 #
--- a/configure.in
+++ b/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)
--- a/content/events/public/Makefile.in
+++ b/content/events/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =			    \
 	nsIEventListenerManager.h   \
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -33,7 +33,7 @@ CPPSRCS =				\
 	nsDOMEventsIIDs.cpp			\
 	$(NULL)

-MODULE = raptor
+MODULE=layout

 EXPORTS = \
 	nsEventListenerManager.h \
--- a/content/html/content/public/Makefile.in
+++ b/content/html/content/public/Makefile.in
@ -29,7 +29,7 @@ EXPORTS =			\

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-MODULE = raptor
+MODULE=layout

 include $(topsrcdir)/config/config.mk

--- a/content/html/content/src/Makefile.in
+++ b/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
--- a/content/xml/content/public/Makefile.in
+++ b/content/xml/content/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =				\
 	nsIXMLContent.h			\
--- a/content/xml/content/src/Makefile.in
+++ b/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


--- a/content/xml/document/public/Makefile.in
+++ b/content/xml/document/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =				\
 	nsIXMLContentSink.h		\
--- a/content/xml/document/src/Makefile.in
+++ b/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


--- a/dom/src/base/Makefile.in
+++ b/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

--- a/dom/src/build/Makefile.in
+++ b/dom/src/build/Makefile.in
@ -28,7 +28,7 @@ CFLAGS	+= -D_IMPL_NS_DOM

 LIBRARY_NAME = jsdom

-MODULE=raptor
+MODULE=dom

 REQUIRES=xpcom raptor

--- a/dom/src/coreDOM/Makefile.in
+++ b/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

--- a/dom/src/css/Makefile.in
+++ b/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

--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -31,7 +31,7 @@ CPPSRCS =				\
 	nsJSEvent.cpp			\
 	$(NULL)

-MODULE = raptor
+MODULE=dom

 REQUIRES = xpcom raptor dom js

--- a/dom/src/html/Makefile.in
+++ b/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

--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@ -84,7 +84,7 @@ EXPORTS += $(EXTRA_EXPORTS)

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-MODULE = raptor
+MODULE=htmlparser

 REQUIRES = xpcom netlib raptor

--- a/layout/base/public/Makefile.in
+++ b/layout/base/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =				\
 	nslayout.h			\
--- a/layout/base/src/Makefile.in
+++ b/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
--- a/layout/build/Makefile.in
+++ b/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	\
--- a/layout/events/public/Makefile.in
+++ b/layout/events/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =			    \
 	nsIEventListenerManager.h   \
--- a/layout/events/src/Makefile.in
+++ b/layout/events/src/Makefile.in
@ -33,7 +33,7 @@ CPPSRCS =				\
 	nsDOMEventsIIDs.cpp			\
 	$(NULL)

-MODULE = raptor
+MODULE=layout

 EXPORTS = \
 	nsEventListenerManager.h \
--- a/layout/html/base/src/Makefile.in
+++ b/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::
--- a/layout/html/content/public/Makefile.in
+++ b/layout/html/content/public/Makefile.in
@ -29,7 +29,7 @@ EXPORTS =			\

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-MODULE = raptor
+MODULE=layout

 include $(topsrcdir)/config/config.mk

--- a/layout/html/content/src/Makefile.in
+++ b/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
--- a/layout/html/document/src/Makefile.in
+++ b/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


--- a/layout/html/forms/public/Makefile.in
+++ b/layout/html/forms/public/Makefile.in
@ -28,7 +28,7 @@ EXPORTS =			\

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-MODULE = raptor
+MODULE=layout

 include $(topsrcdir)/config/config.mk

--- a/layout/html/forms/src/Makefile.in
+++ b/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

--- a/layout/html/style/public/Makefile.in
+++ b/layout/html/style/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =               \
        nsCSSAtoms.h	\
--- a/layout/html/style/src/Makefile.in
+++ b/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

--- a/layout/html/table/src/Makefile.in
+++ b/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
--- a/layout/xml/content/public/Makefile.in
+++ b/layout/xml/content/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =				\
 	nsIXMLContent.h			\
--- a/layout/xml/content/src/Makefile.in
+++ b/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


--- a/layout/xml/document/public/Makefile.in
+++ b/layout/xml/document/public/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE = raptor
+MODULE=layout

 EXPORTS =				\
 	nsIXMLContentSink.h		\
--- a/layout/xml/document/src/Makefile.in
+++ b/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


--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@ -84,7 +84,7 @@ EXPORTS += $(EXTRA_EXPORTS)

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-MODULE = raptor
+MODULE=htmlparser

 REQUIRES = xpcom netlib raptor

--- a/widget/src/gtk/Makefile.in
+++ b/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

--- a/widget/src/motif/Makefile.in
+++ b/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

--- a/widget/src/rhapsody/Makefile.in
+++ b/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

--- a/widget/src/xpwidgets/Makefile.in
+++ b/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