General cleanup.

1999-09-14 01:02:20 +00:00 · 1999-09-14 01:02:20 +00:00 · cfc3c850ed
--- a/content/events/Makefile.in
+++ b/content/events/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,47 +13,37 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = raptorevents_s
+MODULE		= layout
+LIBRARY_NAME	= raptorevents_s

-DEFINES += -D_IMPL_NS_HTML
+REQUIRES	= xpcom raptor dom js netlib

-CPPSRCS =				\
-	nsEventListenerManager.cpp	\
-	nsEventStateManager.cpp	\
-	nsDOMEvent.cpp			\
-	nsDOMEventsIIDs.cpp			\
-	nsPrivateTextRange.cpp		\
-	$(NULL)
+CPPSRCS		= \
+		nsEventListenerManager.cpp \
+		nsEventStateManager.cpp \
+		nsDOMEvent.cpp \
+		nsDOMEventsIIDs.cpp \
+		nsPrivateTextRange.cpp \
+		$(NULL)

-MODULE=layout
+EXPORTS		= \
+		nsEventListenerManager.h \
+		nsEventStateManager.h \
+		nsDOMEvent.h \
+		nsDOMEventsIIDs.h \
+		nsPrivateTextRange.h \
+		$(NULL)

-EXPORTS = \
-	nsEventListenerManager.h \
-	nsEventStateManager.h \
-	nsDOMEvent.h \
-	nsDOMEventsIIDs.h \
-	nsPrivateTextRange.h  \
-	$(NULL)
-
-EXPORTS :=  $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES = xpcom raptor dom js netlib
-
-include $(topsrcdir)/config/config.mk
-
-INCLUDES += -I$(PUBLIC)/dom \
-			-I$(srcdir)/../../html/base/src \
-			$(NULL)
-
-MKSHLIB :=
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@ -62,3 +51,7 @@ override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk

+DEFINES		+= -D_IMPL_NS_HTML
+
+INCLUDES	+= -I$(PUBLIC)/dom -I$(srcdir)/../../html/base/src
+
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -28,71 +28,71 @@ LIBRARY_NAME	= nglhtmlcon_s
 REQUIRES	= xpcom raptor dom js netlib

 CPPSRCS		= \
-nsAttributeContent.cpp \
-nsGenericHTMLElement.cpp \
-nsGenericDOMHTMLCollection.cpp \
-GenericElementCollection.cpp \
-nsHTMLAnchorElement.cpp \
-nsHTMLAppletElement.cpp \
-nsHTMLAreaElement.cpp \
-nsHTMLBRElement.cpp \
-nsHTMLBaseElement.cpp \
-nsHTMLBaseFontElement.cpp \
-nsHTMLBodyElement.cpp \
-nsHTMLButtonElement.cpp \
-nsHTMLDListElement.cpp \
-nsHTMLDelElement.cpp \
-nsHTMLDirectoryElement.cpp \
-nsHTMLDivElement.cpp \
-nsHTMLEmbedElement.cpp \
-nsHTMLFieldSetElement.cpp \
-nsHTMLFontElement.cpp \
-nsHTMLFormElement.cpp \
-nsHTMLFrameElement.cpp \
-nsHTMLFrameSetElement.cpp \
-nsHTMLHRElement.cpp \
-nsHTMLHeadElement.cpp \
-nsHTMLHeadingElement.cpp \
-nsHTMLHtmlElement.cpp \
-nsHTMLIFrameElement.cpp \
-nsHTMLImageElement.cpp \
-nsHTMLInputElement.cpp \
-nsHTMLInsElement.cpp \
-nsHTMLIsIndexElement.cpp \
-nsHTMLLIElement.cpp \
-nsHTMLLabelElement.cpp \
-nsHTMLLayerElement.cpp \
-nsHTMLLegendElement.cpp \
-nsHTMLLinkElement.cpp \
-nsHTMLMapElement.cpp \
-nsHTMLMenuElement.cpp \
-nsHTMLMetaElement.cpp \
-nsHTMLModElement.cpp \
-nsHTMLOListElement.cpp \
-nsHTMLObjectElement.cpp \
-nsHTMLOptionElement.cpp \
-nsHTMLOptGroupElement.cpp \
-nsHTMLParagraphElement.cpp \
-nsHTMLParamElement.cpp \
-nsHTMLPreElement.cpp \
-nsHTMLQuoteElement.cpp \
-nsHTMLScriptElement.cpp \
-nsHTMLSelectElement.cpp \
-nsHTMLSpacerElement.cpp \
-nsHTMLSpanElement.cpp \
-nsHTMLStyleElement.cpp \
-nsHTMLTableElement.cpp \
-nsHTMLTableCaptionElement.cpp \
-nsHTMLTableCellElement.cpp \
-nsHTMLTableColElement.cpp \
-nsHTMLTableColGroupElement.cpp \
-nsHTMLTableRowElement.cpp \
-nsHTMLTableSectionElement.cpp \
-nsHTMLTextAreaElement.cpp \
-nsHTMLTitleElement.cpp \
-nsHTMLUListElement.cpp \
-nsHTMLWBRElement.cpp \
-$(NULL)
+		nsAttributeContent.cpp \
+		nsGenericHTMLElement.cpp \
+		nsGenericDOMHTMLCollection.cpp \
+		GenericElementCollection.cpp \
+		nsHTMLAnchorElement.cpp \
+		nsHTMLAppletElement.cpp \
+		nsHTMLAreaElement.cpp \
+		nsHTMLBRElement.cpp \
+		nsHTMLBaseElement.cpp \
+		nsHTMLBaseFontElement.cpp \
+		nsHTMLBodyElement.cpp \
+		nsHTMLButtonElement.cpp \
+		nsHTMLDListElement.cpp \
+		nsHTMLDelElement.cpp \
+		nsHTMLDirectoryElement.cpp \
+		nsHTMLDivElement.cpp \
+		nsHTMLEmbedElement.cpp \
+		nsHTMLFieldSetElement.cpp \
+		nsHTMLFontElement.cpp \
+		nsHTMLFormElement.cpp \
+		nsHTMLFrameElement.cpp \
+		nsHTMLFrameSetElement.cpp \
+		nsHTMLHRElement.cpp \
+		nsHTMLHeadElement.cpp \
+		nsHTMLHeadingElement.cpp \
+		nsHTMLHtmlElement.cpp \
+		nsHTMLIFrameElement.cpp \
+		nsHTMLImageElement.cpp \
+		nsHTMLInputElement.cpp \
+		nsHTMLInsElement.cpp \
+		nsHTMLIsIndexElement.cpp \
+		nsHTMLLIElement.cpp \
+		nsHTMLLabelElement.cpp \
+		nsHTMLLayerElement.cpp \
+		nsHTMLLegendElement.cpp \
+		nsHTMLLinkElement.cpp \
+		nsHTMLMapElement.cpp \
+		nsHTMLMenuElement.cpp \
+		nsHTMLMetaElement.cpp \
+		nsHTMLModElement.cpp \
+		nsHTMLOListElement.cpp \
+		nsHTMLObjectElement.cpp \
+		nsHTMLOptionElement.cpp \
+		nsHTMLOptGroupElement.cpp \
+		nsHTMLParagraphElement.cpp \
+		nsHTMLParamElement.cpp \
+		nsHTMLPreElement.cpp \
+		nsHTMLQuoteElement.cpp \
+		nsHTMLScriptElement.cpp \
+		nsHTMLSelectElement.cpp \
+		nsHTMLSpacerElement.cpp \
+		nsHTMLSpanElement.cpp \
+		nsHTMLStyleElement.cpp \
+		nsHTMLTableElement.cpp \
+		nsHTMLTableCaptionElement.cpp \
+		nsHTMLTableCellElement.cpp \
+		nsHTMLTableColElement.cpp \
+		nsHTMLTableColGroupElement.cpp \
+		nsHTMLTableRowElement.cpp \
+		nsHTMLTableSectionElement.cpp \
+		nsHTMLTextAreaElement.cpp \
+		nsHTMLTitleElement.cpp \
+		nsHTMLUListElement.cpp \
+		nsHTMLWBRElement.cpp \
+		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
--- a/content/xml/Makefile.in
+++ b/content/xml/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = content document
-
-include $(topsrcdir)/config/config.mk
+DIRS		= content document

 include $(topsrcdir)/config/rules.mk
+
--- a/content/xml/content/Makefile.in
+++ b/content/xml/content/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/content/xml/content/public/Makefile.in
+++ b/content/xml/content/public/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,22 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=layout
+MODULE		= layout

-EXPORTS =				\
-	nsIXMLContent.h			\
-        $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		= nsIXMLContent.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,53 +13,44 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-include $(topsrcdir)/config/config.mk
+MODULE		= layout
+LIBRARY_NAME	= raptorxmlcontent_s

-LIBRARY_NAME = raptorxmlcontent_s
+REQUIRES	= xpcom raptor dom netlib js pref

-DEFINES += -D_IMPL_NS_HTML
-
-INCLUDES += \
-	-I$(srcdir)/../../../html/base/src		\
-	-I$(srcdir)/../../../html/document/src    \
-	-I$(srcdir)/../../../html/style/src	\
-	-I$(srcdir)/../../../base/src		\
-	-I$(DIST)/public/raptor			\
-	$(NULL)
-
-# Note the sophisticated alphabetical ordering :-|
-CPPSRCS =				\
-	nsXMLElement.cpp		\
-	nsGenericXMLElement.cpp		\
-	nsXMLCDATASection.cpp		\
-	nsXMLProcessingInstruction.cpp	\
-	nsXMLEntity.cpp \
-	nsXMLNotation.cpp \
-	nsXMLDocumentType.cpp \
-	nsXMLNamedNodeMap.cpp \
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-#EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE=layout
-
-REQUIRES = xpcom raptor dom netlib js pref
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsXMLElement.cpp \
+		nsGenericXMLElement.cpp \
+		nsXMLCDATASection.cpp \
+		nsXMLProcessingInstruction.cpp \
+		nsXMLEntity.cpp \
+		nsXMLNotation.cpp \
+		nsXMLDocumentType.cpp \
+		nsXMLNamedNodeMap.cpp \
+		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+INCLUDES	+= \
+		-I$(srcdir)/../../../html/base/src \
+		-I$(srcdir)/../../../html/document/src \
+		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../base/src \
+		-I$(DIST)/public/raptor \
+		$(NULL)
+
--- a/content/xml/document/Makefile.in
+++ b/content/xml/document/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/content/xml/document/public/Makefile.in
+++ b/content/xml/document/public/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,23 +13,23 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=layout
+MODULE		= layout

-EXPORTS =				\
-	nsIXMLContentSink.h		\
-	nsIXMLDocument.h		\
-        $(NULL)
+EXPORTS		= \
+		nsIXMLContentSink.h \
+		nsIXMLDocument.h \
+		$(NULL)

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,49 +13,40 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-include $(topsrcdir)/config/config.mk
+MODULE		= layout
+LIBRARY_NAME	= raptorxmldoc_s

-LIBRARY_NAME = raptorxmldoc_s
+REQUIRES	= xpcom raptor dom netlib js pref

-DEFINES += -D_IMPL_NS_HTML
-
-INCLUDES += \
-	-I$(srcdir)/../../../html/base/src	\
-	-I$(srcdir)/../../../html/document/src    \
-	-I$(srcdir)/../../../html/content/src	\
-	-I$(srcdir)/../../../html/style/src	\
-	-I$(srcdir)/../../../base/src		\
-	-I$(srcdir)/../../../xul/content/src	\
-	-I$(DIST)/public/raptor			\
-	$(NULL)
-
-# Note the sophisticated alphabetical ordering :-|
-CPPSRCS =				\
-	nsXMLContentSink.cpp		\
-	nsXMLDocument.cpp		\
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-#EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE=layout
-
-REQUIRES = xpcom raptor dom netlib js pref
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsXMLContentSink.cpp \
+		nsXMLDocument.cpp \
+		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+INCLUDES	+= \
+		-I$(srcdir)/../../../html/base/src \
+		-I$(srcdir)/../../../html/document/src \
+		-I$(srcdir)/../../../html/content/src \
+		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../base/src \
+		-I$(srcdir)/../../../xul/content/src \
+		-I$(DIST)/public/raptor \
+		$(NULL)
+
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ..
+DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = base html xml xul events build
-
-include $(topsrcdir)/config/config.mk
+DIRS		= base html xml xul events build

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@ -24,8 +24,9 @@ include $(DEPTH)/config/autoconf.mk

 DIRS		= public src

-ifdef ENABLE_TESTS
+#ifdef ENABLE_TESTS
 #DIRS		+= tests
-endif
+#endif

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/base/public/Makefile.in
+++ b/layout/base/public/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,65 +13,65 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=layout
+MODULE		= layout

-EXPORTS =				\
-	nslayout.h			\
-	nsICaret.h			\
-	nsIContent.h			\
-	nsIContentIterator.h		\
-	nsIDiskDocument.h	\
-	nsIDocument.h			\
-	nsIDocumentContainer.h		\
-	nsIDocumentEncoder.h		\
-	nsIDocumentObserver.h		\
-	nsIDocumentViewer.h		\
-	nsIFocusTracker.h		\
-	nsIFrame.h			\
-	nsIFrameImageLoader.h		\
-	nsIFrameManager.h		\
-	nsILayoutDebugger.h		\
-	nsINameSpace.h			\
-	nsINameSpaceManager.h		\
-	nsIFrameReflow.h		\
-	nsIFrameUtil.h			\
-	nsIPageSequenceFrame.h		\
-	nsIPresContext.h		\
-	nsIPresShell.h			\
-	nsIReflowCommand.h		\
-	nsIFrameSelection.h		\
-	nsISpaceManager.h		\
-	nsIStyledContent.h		\
-	nsIStyleContext.h		\
-	nsIStyleFrameConstruction.h	\
-	nsIStyleRule.h			\
-	nsIStyleSet.h			\
-	nsIStyleSheet.h			\
-	nsIStyleSheetLinkingElement.h	\
-	nsITextContent.h		\
-	nsLayoutAtoms.h			\
-	nsLayoutAtomList.h			\
-	nsFrameList.h			\
-	nsFrameTraversal.h		\
-	nsStyleChangeList.h		\
-	nsStyleConsts.h			\
-	nsStyleCoord.h			\
-	nsStyleStruct.h			\
-	nsTextFragment.h		\
-	nsILayoutHistoryState.h \
-	nsIStatefulFrame.h \
-	$(NULL)
+EXPORTS		= \
+nslayout.h \
+nsICaret.h \
+nsIContent.h \
+nsIContentIterator.h \
+nsIDiskDocument.h \
+nsIDocument.h \
+nsIDocumentContainer.h \
+nsIDocumentEncoder.h \
+nsIDocumentObserver.h \
+nsIDocumentViewer.h \
+nsIFocusTracker.h \
+nsIFrame.h \
+nsIFrameImageLoader.h \
+nsIFrameManager.h \
+nsILayoutDebugger.h \
+nsINameSpace.h \
+nsINameSpaceManager.h \
+nsIFrameReflow.h \
+nsIFrameUtil.h \
+nsIPageSequenceFrame.h \
+nsIPresContext.h \
+nsIPresShell.h \
+nsIReflowCommand.h \
+nsIFrameSelection.h \
+nsISpaceManager.h \
+nsIStyledContent.h \
+nsIStyleContext.h \
+nsIStyleFrameConstruction.h \
+nsIStyleRule.h \
+nsIStyleSet.h \
+nsIStyleSheet.h \
+nsIStyleSheetLinkingElement.h \
+nsITextContent.h \
+nsLayoutAtoms.h \
+nsLayoutAtomList.h \
+nsFrameList.h \
+nsFrameTraversal.h \
+nsStyleChangeList.h \
+nsStyleConsts.h \
+nsStyleCoord.h \
+nsStyleStruct.h \
+nsTextFragment.h \
+nsILayoutHistoryState.h \
+nsIStatefulFrame.h \
+$(NULL)

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/base/src/Makefile.in
+++ b/layout/base/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,75 +13,71 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.1
+#

-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = raptorlayout_s
+MODULE		= layout
+LIBRARY_NAME	= raptorlayout_s

-MODULE=layout
+CPPSRCS		= \
+		nsCaret.cpp \
+		nsCommentNode.cpp \
+		nsContentIterator.cpp \
+		nsContentList.cpp \
+		nsDocument.cpp \
+		nsDocumentEncoder.cpp \
+		nsDocumentFragment.cpp \
+		nsDocumentViewer.cpp \
+		nsDOMAttribute.cpp \
+		nsDOMAttributeMap.cpp \
+		nsFrameImageLoader.cpp \
+		nsFrameList.cpp \
+		nsFrameTraversal.cpp \
+		nsFrameUtil.cpp \
+		nsGalleyContext.cpp \
+		nsGenericDOMDataNode.cpp \
+		nsGenericDOMNodeList.cpp \
+		nsGenericElement.cpp \
+		nsLayoutAtoms.cpp \
+		nsLayoutDebugger.cpp \
+		nsNameSpaceManager.cpp \
+		nsPluginViewer.cpp \
+		nsPresContext.cpp \
+		nsPrintContext.cpp \
+		nsPrintPreviewContext.cpp \
+		nsRange.cpp \
+		nsRangeList.cpp \
+		nsSpaceManager.cpp \
+		nsStyleChangeList.cpp \
+		nsStyleCoord.cpp \
+		nsStyleContext.cpp \
+		nsStyleSet.cpp \
+		nsTextFragment.cpp \
+		nsTextNode.cpp \
+		nsXIFConverter.cpp \
+		nsLayoutHistoryState.cpp \
+		$(NULL)

-# Alphabetical list of source files
-CPPSRCS =				\
-	nsCaret.cpp			\
-	nsCommentNode.cpp		\
-	nsContentIterator.cpp		\
-	nsContentList.cpp		\
-	nsDocument.cpp			\
-	nsDocumentEncoder.cpp		\
-	nsDocumentFragment.cpp		\
-	nsDocumentViewer.cpp		\
-	nsDOMAttribute.cpp		\
-	nsDOMAttributeMap.cpp		\
-	nsFrameImageLoader.cpp		\
-	nsFrameList.cpp			\
-	nsFrameTraversal.cpp		\
-	nsFrameUtil.cpp			\
-	nsGalleyContext.cpp		\
-	nsGenericDOMDataNode.cpp	\
-	nsGenericDOMNodeList.cpp	\
-	nsGenericElement.cpp		\
-	nsLayoutAtoms.cpp		\
-	nsLayoutDebugger.cpp		\
-	nsNameSpaceManager.cpp		\
-	nsPluginViewer.cpp		\
-	nsPresContext.cpp		\
-	nsPrintContext.cpp		\
-	nsPrintPreviewContext.cpp	\
-	nsRange.cpp			\
-	nsRangeList.cpp			\
-	nsSpaceManager.cpp		\
-	nsStyleChangeList.cpp		\
-	nsStyleCoord.cpp		\
-	nsStyleContext.cpp		\
-	nsStyleSet.cpp			\
-	nsTextFragment.cpp		\
-	nsTextNode.cpp			\
-	nsXIFConverter.cpp		\
-	nsLayoutHistoryState.cpp \
-	$(NULL)
+EXPORTS		= \
+		nsDocument.h \
+		nsXIFConverter.h \
+		$(NULL)

-EXPORTS = \
-	nsDocument.h \
-	nsXIFConverter.h \
-	$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-DEFINES += -D_IMPL_NS_LAYOUT
-
-INCLUDES +=  -I$(srcdir)/../../html/base/src -I$(srcdir)/../../html/style/src
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MKSHLIB :=
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_LAYOUT
+
+INCLUDES	+= -I$(srcdir)/../../html/base/src -I$(srcdir)/../../html/style/src
+
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@ -28,7 +28,6 @@ CPPSRCS		= TestSpaceManager.cpp

 LOCAL_INCLUDES	= -I$(srcdir)/../src

-
 LIBS		+= \
 		 $(DIST)/lib/libraptorlayout_s.a \
 		-lraptorgfx \
@ -40,3 +39,4 @@ LIBS		+= \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -60,12 +60,12 @@ EXTRA_DSO_LDOPTS = \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
 		-L$(DIST)/bin \
-		$(NSPR_LIBS)	\
-		-lxpcom		\
+		$(NSPR_LIBS) \
+		-lxpcom \
 		-lraptorhtmlpars \
-		-lraptorgfx		\
+		-lraptorgfx \
 		-ljsdom \
-		-lmozjs	\
+		-lmozjs \
 		-L$(DIST)/lib \
 		$(MOZ_TIMER_LIBS) \
 		$(NULL)
@ -74,8 +74,7 @@ include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_HTML

-INCLUDES	+= -I$(srcdir)/../html/base/src \
-		   -I$(srcdir)/../xul/content/src
+INCLUDES	+= -I$(srcdir)/../html/base/src -I$(srcdir)/../xul/content/src

 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile

--- a/layout/events/Makefile.in
+++ b/layout/events/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/events/src/Makefile.in
+++ b/layout/events/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,47 +13,37 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = raptorevents_s
+MODULE		= layout
+LIBRARY_NAME	= raptorevents_s

-DEFINES += -D_IMPL_NS_HTML
+REQUIRES	= xpcom raptor dom js netlib

-CPPSRCS =				\
-	nsEventListenerManager.cpp	\
-	nsEventStateManager.cpp	\
-	nsDOMEvent.cpp			\
-	nsDOMEventsIIDs.cpp			\
-	nsPrivateTextRange.cpp		\
-	$(NULL)
+CPPSRCS		= \
+		nsEventListenerManager.cpp \
+		nsEventStateManager.cpp \
+		nsDOMEvent.cpp \
+		nsDOMEventsIIDs.cpp \
+		nsPrivateTextRange.cpp \
+		$(NULL)

-MODULE=layout
+EXPORTS		= \
+		nsEventListenerManager.h \
+		nsEventStateManager.h \
+		nsDOMEvent.h \
+		nsDOMEventsIIDs.h \
+		nsPrivateTextRange.h \
+		$(NULL)

-EXPORTS = \
-	nsEventListenerManager.h \
-	nsEventStateManager.h \
-	nsDOMEvent.h \
-	nsDOMEventsIIDs.h \
-	nsPrivateTextRange.h  \
-	$(NULL)
-
-EXPORTS :=  $(addprefix $(srcdir)/, $(EXPORTS))
-
-REQUIRES = xpcom raptor dom js netlib
-
-include $(topsrcdir)/config/config.mk
-
-INCLUDES += -I$(PUBLIC)/dom \
-			-I$(srcdir)/../../html/base/src \
-			$(NULL)
-
-MKSHLIB :=
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
@ -62,3 +51,7 @@ override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk

+DEFINES		+= -D_IMPL_NS_HTML
+
+INCLUDES	+= -I$(PUBLIC)/dom -I$(srcdir)/../../html/base/src
+
--- a/layout/html/base/src/Makefile.in
+++ b/layout/html/base/src/Makefile.in
@ -86,7 +86,7 @@ include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_HTML
 ifeq ($(OS_ARCH), Linux)
-DEFINES         += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif

 INCLUDES	+= \
@ -95,7 +95,7 @@ INCLUDES	+= \
 		-I$(srcdir)/../../style/src \
 		-I$(srcdir)/../../content/src \
 		-I$(srcdir)/../../../base/src \
-		-I$(srcdir)/. \
+		-I$(srcdir) \
 		-I$(DIST)/oji \
 		$(NULL)

--- a/layout/html/content/src/Makefile.in
+++ b/layout/html/content/src/Makefile.in
@ -28,71 +28,71 @@ LIBRARY_NAME	= nglhtmlcon_s
 REQUIRES	= xpcom raptor dom js netlib

 CPPSRCS		= \
-nsAttributeContent.cpp \
-nsGenericHTMLElement.cpp \
-nsGenericDOMHTMLCollection.cpp \
-GenericElementCollection.cpp \
-nsHTMLAnchorElement.cpp \
-nsHTMLAppletElement.cpp \
-nsHTMLAreaElement.cpp \
-nsHTMLBRElement.cpp \
-nsHTMLBaseElement.cpp \
-nsHTMLBaseFontElement.cpp \
-nsHTMLBodyElement.cpp \
-nsHTMLButtonElement.cpp \
-nsHTMLDListElement.cpp \
-nsHTMLDelElement.cpp \
-nsHTMLDirectoryElement.cpp \
-nsHTMLDivElement.cpp \
-nsHTMLEmbedElement.cpp \
-nsHTMLFieldSetElement.cpp \
-nsHTMLFontElement.cpp \
-nsHTMLFormElement.cpp \
-nsHTMLFrameElement.cpp \
-nsHTMLFrameSetElement.cpp \
-nsHTMLHRElement.cpp \
-nsHTMLHeadElement.cpp \
-nsHTMLHeadingElement.cpp \
-nsHTMLHtmlElement.cpp \
-nsHTMLIFrameElement.cpp \
-nsHTMLImageElement.cpp \
-nsHTMLInputElement.cpp \
-nsHTMLInsElement.cpp \
-nsHTMLIsIndexElement.cpp \
-nsHTMLLIElement.cpp \
-nsHTMLLabelElement.cpp \
-nsHTMLLayerElement.cpp \
-nsHTMLLegendElement.cpp \
-nsHTMLLinkElement.cpp \
-nsHTMLMapElement.cpp \
-nsHTMLMenuElement.cpp \
-nsHTMLMetaElement.cpp \
-nsHTMLModElement.cpp \
-nsHTMLOListElement.cpp \
-nsHTMLObjectElement.cpp \
-nsHTMLOptionElement.cpp \
-nsHTMLOptGroupElement.cpp \
-nsHTMLParagraphElement.cpp \
-nsHTMLParamElement.cpp \
-nsHTMLPreElement.cpp \
-nsHTMLQuoteElement.cpp \
-nsHTMLScriptElement.cpp \
-nsHTMLSelectElement.cpp \
-nsHTMLSpacerElement.cpp \
-nsHTMLSpanElement.cpp \
-nsHTMLStyleElement.cpp \
-nsHTMLTableElement.cpp \
-nsHTMLTableCaptionElement.cpp \
-nsHTMLTableCellElement.cpp \
-nsHTMLTableColElement.cpp \
-nsHTMLTableColGroupElement.cpp \
-nsHTMLTableRowElement.cpp \
-nsHTMLTableSectionElement.cpp \
-nsHTMLTextAreaElement.cpp \
-nsHTMLTitleElement.cpp \
-nsHTMLUListElement.cpp \
-nsHTMLWBRElement.cpp \
-$(NULL)
+		nsAttributeContent.cpp \
+		nsGenericHTMLElement.cpp \
+		nsGenericDOMHTMLCollection.cpp \
+		GenericElementCollection.cpp \
+		nsHTMLAnchorElement.cpp \
+		nsHTMLAppletElement.cpp \
+		nsHTMLAreaElement.cpp \
+		nsHTMLBRElement.cpp \
+		nsHTMLBaseElement.cpp \
+		nsHTMLBaseFontElement.cpp \
+		nsHTMLBodyElement.cpp \
+		nsHTMLButtonElement.cpp \
+		nsHTMLDListElement.cpp \
+		nsHTMLDelElement.cpp \
+		nsHTMLDirectoryElement.cpp \
+		nsHTMLDivElement.cpp \
+		nsHTMLEmbedElement.cpp \
+		nsHTMLFieldSetElement.cpp \
+		nsHTMLFontElement.cpp \
+		nsHTMLFormElement.cpp \
+		nsHTMLFrameElement.cpp \
+		nsHTMLFrameSetElement.cpp \
+		nsHTMLHRElement.cpp \
+		nsHTMLHeadElement.cpp \
+		nsHTMLHeadingElement.cpp \
+		nsHTMLHtmlElement.cpp \
+		nsHTMLIFrameElement.cpp \
+		nsHTMLImageElement.cpp \
+		nsHTMLInputElement.cpp \
+		nsHTMLInsElement.cpp \
+		nsHTMLIsIndexElement.cpp \
+		nsHTMLLIElement.cpp \
+		nsHTMLLabelElement.cpp \
+		nsHTMLLayerElement.cpp \
+		nsHTMLLegendElement.cpp \
+		nsHTMLLinkElement.cpp \
+		nsHTMLMapElement.cpp \
+		nsHTMLMenuElement.cpp \
+		nsHTMLMetaElement.cpp \
+		nsHTMLModElement.cpp \
+		nsHTMLOListElement.cpp \
+		nsHTMLObjectElement.cpp \
+		nsHTMLOptionElement.cpp \
+		nsHTMLOptGroupElement.cpp \
+		nsHTMLParagraphElement.cpp \
+		nsHTMLParamElement.cpp \
+		nsHTMLPreElement.cpp \
+		nsHTMLQuoteElement.cpp \
+		nsHTMLScriptElement.cpp \
+		nsHTMLSelectElement.cpp \
+		nsHTMLSpacerElement.cpp \
+		nsHTMLSpanElement.cpp \
+		nsHTMLStyleElement.cpp \
+		nsHTMLTableElement.cpp \
+		nsHTMLTableCaptionElement.cpp \
+		nsHTMLTableCellElement.cpp \
+		nsHTMLTableColElement.cpp \
+		nsHTMLTableColGroupElement.cpp \
+		nsHTMLTableRowElement.cpp \
+		nsHTMLTableSectionElement.cpp \
+		nsHTMLTextAreaElement.cpp \
+		nsHTMLTitleElement.cpp \
+		nsHTMLUListElement.cpp \
+		nsHTMLWBRElement.cpp \
+		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
--- a/layout/html/document/src/Makefile.in
+++ b/layout/html/document/src/Makefile.in
@ -22,8 +22,8 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME	= raptorhtmldoc_s
 MODULE		= layout
+LIBRARY_NAME	= raptorhtmldoc_s

 REQUIRES	= xpcom raptor dom netlib js pref

--- a/layout/html/forms/src/Makefile.in
+++ b/layout/html/forms/src/Makefile.in
@ -66,7 +66,7 @@ include $(topsrcdir)/config/rules.mk

 DEFINES		+= -D_IMPL_NS_HTML
 ifeq ($(OS_ARCH), Linux)
-DEFINES         += -D_BSD_SOURCE
+DEFINES		+= -D_BSD_SOURCE
 endif

 INCLUDES	+= \
--- a/layout/tools/Makefile.in
+++ b/layout/tools/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,52 +13,53 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-TARGETS = generated
+CPPSRCS		= \
+		nsCSSProps.cpp \
+		nsCSSKeywords.cpp \
+		nsColorNames.cpp \
+		$(NULL)

-CPPSRCS = nsCSSProps.cpp nsCSSKeywords.cpp nsColorNames.cpp
-
-HEADERS = nsCSSPropIDs.h nsCSSKeywordIDs.h nsColorNameIDs.h
-
-GENHASH_PL = $(srcdir)/genhash.pl
-GENHASH_INC = genhash.inc
-GENHASH = $(PERL) $(GENHASH_PL)
-
-include $(topsrcdir)/config/config.mk
+GENHASH_PL	= $(srcdir)/genhash.pl
+GENHASH_INC	= genhash.inc
+GENHASH		= $(PERL) $(GENHASH_PL)

 include $(topsrcdir)/config/rules.mk

-all:: $(CPPSRCS)
+GARBAGE		+= nsCSSPropIDs.h nsCSSKeywordIDs.h nsColorNameIDs.h nsColorNamesRGB.cpp $(CPPSRCS)

 export:: $(CPPSRCS)

-clobber::
-	rm -f $(CPPSRCS) $(HEADERS) nsColorNamesRGB.cpp
-
 nsCSSProps.cpp: $(GENHASH_PL) $(GENHASH_INC) CSSProps.txt Makefile
-	$(GENHASH) "1,2,6,8,12" "-r" nsCSSProps PROP_ CSSProps.txt nsCSSPropIDs.h > nsCSSProps.cpp
-	cp nsCSSProps.cpp nsCSSPropIDs.h ../html/style/src
+	@rm -f $@
+	$(GENHASH) "1,2,6,8,12" "-r" nsCSSProps PROP_ CSSProps.txt nsCSSPropIDs.h > $@
+	cp $@ nsCSSPropIDs.h ../html/style/src/.

 nsCSSKeywords.cpp: $(GENHASH_PL) $(GENHASH_INC) CSSKeywords.txt Makefile
-	$(GENHASH) "1,2,3,4,6,8,12" "-r" nsCSSKeywords KEYWORD_ CSSKeywords.txt nsCSSKeywordIDs.h > nsCSSKeywords.cpp
-	cp nsCSSKeywords.cpp nsCSSKeywordIDs.h ../html/style/src
+	@rm -f $@
+	$(GENHASH) "1,2,3,4,6,8,12" "-r" nsCSSKeywords KEYWORD_ CSSKeywords.txt nsCSSKeywordIDs.h > $@
+	cp $@ nsCSSKeywordIDs.h ../html/style/src/.

-RGB = nsColorNamesRGB.cpp
+nsColorNames.cpp: $(GENHASH_PL) $(GENHASH_INC) nsColorNamesRGB.cpp $(srcdir)/ColorNames.txt Makefile
+	@rm -f $@ cnames
+	@sed 's/:.*//' $(srcdir)/ColorNames.txt > cnames
+	$(GENHASH) "1,2,3,5,6,7,8,9,11,12,13" "-o" nsColorNames COLOR_ cnames nsColorNameIDs.h > $@
+	cp $@ nsColorNameIDs.h nsColorNamesRGB.cpp ../../gfx/src/.
+	@rm -f cnames
+
+nsColorNamesRGB.cpp: $(srcdir)/ColorNames.txt
+	@rm -f $@
+	@echo "/* Do not edit - generated by tools/Makefile */" > $@
+	@echo "#include \"nsColorNames.h\"" >> $@
+	@echo "nscolor nsColorNames::kColors[COLOR_MAX] = {" >> $@
+	@sed -e 's/.*://' -e 's/$$/,/' $< >> $@
+	@echo "};" >> $@

-nsColorNames.cpp: $(GENHASH_PL) $(GENHASH_INC) ColorNames.txt Makefile
-	sed -e 's/:.*//' < $(srcdir)/ColorNames.txt > cnames
-	echo "/* Do not edit - generated by tools/Makefile */" > $(RGB)
-	echo "#include \"nsColorNames.h\"" >> $(RGB)
-	echo "nscolor nsColorNames::kColors[COLOR_MAX] = {" >> $(RGB)
-	sed -e 's/.*://' -e 's/$$/,/' < $(srcdir)/ColorNames.txt >> $(RGB)
-	echo "};" >> $(RGB)
-	$(GENHASH) "1,2,3,5,6,7,8,9,11,12,13" "-o" nsColorNames COLOR_ cnames nsColorNameIDs.h > nsColorNames.cpp
-	cp nsColorNames.cpp nsColorNameIDs.h nsColorNamesRGB.cpp ../../gfx/src
-	rm cnames
--- a/layout/xml/Makefile.in
+++ b/layout/xml/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = content document
-
-include $(topsrcdir)/config/config.mk
+DIRS		= content document

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xml/content/Makefile.in
+++ b/layout/xml/content/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xml/content/public/Makefile.in
+++ b/layout/xml/content/public/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,22 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=layout
+MODULE		= layout

-EXPORTS =				\
-	nsIXMLContent.h			\
-        $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		= nsIXMLContent.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xml/content/src/Makefile.in
+++ b/layout/xml/content/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,53 +13,44 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-include $(topsrcdir)/config/config.mk
+MODULE		= layout
+LIBRARY_NAME	= raptorxmlcontent_s

-LIBRARY_NAME = raptorxmlcontent_s
+REQUIRES	= xpcom raptor dom netlib js pref

-DEFINES += -D_IMPL_NS_HTML
-
-INCLUDES += \
-	-I$(srcdir)/../../../html/base/src		\
-	-I$(srcdir)/../../../html/document/src    \
-	-I$(srcdir)/../../../html/style/src	\
-	-I$(srcdir)/../../../base/src		\
-	-I$(DIST)/public/raptor			\
-	$(NULL)
-
-# Note the sophisticated alphabetical ordering :-|
-CPPSRCS =				\
-	nsXMLElement.cpp		\
-	nsGenericXMLElement.cpp		\
-	nsXMLCDATASection.cpp		\
-	nsXMLProcessingInstruction.cpp	\
-	nsXMLEntity.cpp \
-	nsXMLNotation.cpp \
-	nsXMLDocumentType.cpp \
-	nsXMLNamedNodeMap.cpp \
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-#EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE=layout
-
-REQUIRES = xpcom raptor dom netlib js pref
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsXMLElement.cpp \
+		nsGenericXMLElement.cpp \
+		nsXMLCDATASection.cpp \
+		nsXMLProcessingInstruction.cpp \
+		nsXMLEntity.cpp \
+		nsXMLNotation.cpp \
+		nsXMLDocumentType.cpp \
+		nsXMLNamedNodeMap.cpp \
+		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+INCLUDES	+= \
+		-I$(srcdir)/../../../html/base/src \
+		-I$(srcdir)/../../../html/document/src \
+		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../base/src \
+		-I$(DIST)/public/raptor \
+		$(NULL)
+
--- a/layout/xml/document/Makefile.in
+++ b/layout/xml/document/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xml/document/public/Makefile.in
+++ b/layout/xml/document/public/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,23 +13,23 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=layout
+MODULE		= layout

-EXPORTS =				\
-	nsIXMLContentSink.h		\
-	nsIXMLDocument.h		\
-        $(NULL)
+EXPORTS		= \
+		nsIXMLContentSink.h \
+		nsIXMLDocument.h \
+		$(NULL)

-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xml/document/src/Makefile.in
+++ b/layout/xml/document/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,49 +13,40 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-include $(topsrcdir)/config/config.mk
+MODULE		= layout
+LIBRARY_NAME	= raptorxmldoc_s

-LIBRARY_NAME = raptorxmldoc_s
+REQUIRES	= xpcom raptor dom netlib js pref

-DEFINES += -D_IMPL_NS_HTML
-
-INCLUDES += \
-	-I$(srcdir)/../../../html/base/src	\
-	-I$(srcdir)/../../../html/document/src    \
-	-I$(srcdir)/../../../html/content/src	\
-	-I$(srcdir)/../../../html/style/src	\
-	-I$(srcdir)/../../../base/src		\
-	-I$(srcdir)/../../../xul/content/src	\
-	-I$(DIST)/public/raptor			\
-	$(NULL)
-
-# Note the sophisticated alphabetical ordering :-|
-CPPSRCS =				\
-	nsXMLContentSink.cpp		\
-	nsXMLDocument.cpp		\
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-#EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE=layout
-
-REQUIRES = xpcom raptor dom netlib js pref
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsXMLContentSink.cpp \
+		nsXMLDocument.cpp \
+		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+INCLUDES	+= \
+		-I$(srcdir)/../../../html/base/src \
+		-I$(srcdir)/../../../html/document/src \
+		-I$(srcdir)/../../../html/content/src \
+		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../base/src \
+		-I$(srcdir)/../../../xul/content/src \
+		-I$(DIST)/public/raptor \
+		$(NULL)
+
--- a/layout/xul/Makefile.in
+++ b/layout/xul/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = content base
-
-include $(topsrcdir)/config/config.mk
+DIRS		= content base

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xul/base/Makefile.in
+++ b/layout/xul/base/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xul/base/public/Makefile.in
+++ b/layout/xul/base/public/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,22 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE=layout
+MODULE		= layout

-EXPORTS =				\
-	nsIPopupSetFrame.h			\
-        $(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/config.mk
+EXPORTS		= nsIPopupSetFrame.h
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,76 +13,73 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBRARY_NAME = raptorxulbase_s
+MODULE		= layout
+LIBRARY_NAME	= raptorxulbase_s

-LOCAL_INCLUDES = \
-	-I$(srcdir)/../../../base/src		\
-	-I$(srcdir)/../../../html/table/src \
-	-I$(srcdir)/../../../html/style/src \
-	-I$(srcdir)/../../../html/base/src \
-	-I$(srcdir)/../../../html/forms/src \
-	-I$(srcdir)/../../content/src \
-	-I$(srcdir)/../../../html/content/src \
-	-I$(srcdir)/../../../xml/content/src \
-	-I$(srcdir)/../../../base/public \
-	$(NULL)
-
-# Note the sophisticated alphabetical ordering :-|
-CPPSRCS =				\
-	nsFrameNavigator.cpp \
-	nsSplitterFrame.cpp \
-	nsGrippyFrame.cpp \
-	nsTabFrame.cpp \
-	nsDeckFrame.cpp \
-	nsBoxFrame.cpp \
-	nsProgressMeterFrame.cpp      \
-	nsTitledButtonFrame.cpp   \
-	nsToolbarFrame.cpp        \
-	nsToolbarDragListener.cpp \
-	nsToolboxFrame.cpp        \
-	nsTreeOuterFrame.cpp \
-	nsTreeFrame.cpp \
-	nsTreeRowGroupFrame.cpp \
-	nsTreeIndentationFrame.cpp \
-	nsTreeCellFrame.cpp \
-	nsTreeRowFrame.cpp \
-	nsTreeTwistyListener.cpp \
-	nsSpinnerFrame.cpp \
-	nsScrollbarFrame.cpp \
-	nsScrollbarButtonFrame.cpp \
-	nsSliderFrame.cpp \
-	nsColorPickerFrame.cpp \
-	nsStdColorPicker.cpp \
-	nsFontPickerFrame.cpp \
-	nsToolbarItemFrame.cpp \
-	nsMenuPopupFrame.cpp \
-	nsMenuFrame.cpp \
-	nsMenuBarFrame.cpp \
-	nsMenuBarListener.cpp \
-	nsMenuPopupEntryListener.cpp \
-	nsPopupSetFrame.cpp \
-	nsRepeatService.cpp \
-	$(NULL)
+CPPSRCS		= \
+		nsFrameNavigator.cpp \
+		nsSplitterFrame.cpp \
+		nsGrippyFrame.cpp \
+		nsTabFrame.cpp \
+		nsDeckFrame.cpp \
+		nsBoxFrame.cpp \
+		nsProgressMeterFrame.cpp \
+		nsTitledButtonFrame.cpp \
+		nsToolbarFrame.cpp \
+		nsToolbarDragListener.cpp \
+		nsToolboxFrame.cpp \
+		nsTreeOuterFrame.cpp \
+		nsTreeFrame.cpp \
+		nsTreeRowGroupFrame.cpp \
+		nsTreeIndentationFrame.cpp \
+		nsTreeCellFrame.cpp \
+		nsTreeRowFrame.cpp \
+		nsTreeTwistyListener.cpp \
+		nsSpinnerFrame.cpp \
+		nsScrollbarFrame.cpp \
+		nsScrollbarButtonFrame.cpp \
+		nsSliderFrame.cpp \
+		nsColorPickerFrame.cpp \
+		nsStdColorPicker.cpp \
+		nsFontPickerFrame.cpp \
+		nsToolbarItemFrame.cpp \
+		nsMenuPopupFrame.cpp \
+		nsMenuFrame.cpp \
+		nsMenuBarFrame.cpp \
+		nsMenuBarListener.cpp \
+		nsMenuPopupEntryListener.cpp \
+		nsPopupSetFrame.cpp \
+		nsRepeatService.cpp \
+		$(NULL)

 include $(topsrcdir)/config/config.mk

-DEFINES += -D_IMPL_NS_HTML
-
-MODULE=layout
-
-MKSHLIB :=
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk

+DEFINES		+= -D_IMPL_NS_HTML
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../../../base/src \
+		-I$(srcdir)/../../../html/table/src \
+		-I$(srcdir)/../../../html/style/src \
+		-I$(srcdir)/../../../html/base/src \
+		-I$(srcdir)/../../../html/forms/src \
+		-I$(srcdir)/../../content/src \
+		-I$(srcdir)/../../../html/content/src \
+		-I$(srcdir)/../../../xml/content/src \
+		-I$(srcdir)/../../../base/public \
+		$(NULL)
+
--- a/layout/xul/content/Makefile.in
+++ b/layout/xul/content/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,16 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH = ../../..
+DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-DIRS = src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= src

 include $(topsrcdir)/config/rules.mk
+
--- a/layout/xul/content/src/Makefile.in
+++ b/layout/xul/content/src/Makefile.in
@ -1,4 +1,3 @@
-#!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
@ -14,43 +13,29 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#

-DEPTH=../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-include $(topsrcdir)/config/config.mk
+MODULE		= layout
+LIBRARY_NAME	= raptorxulcontent_s

-LIBRARY_NAME = raptorxulcontent_s
+REQUIRES	= xpcom raptor dom

-DEFINES += -D_IMPL_NS_HTML
-
-INCLUDES += \
-	-I$(srcdir)/../../../base/src		\
-	-I$(DIST)/public/raptor			\
-	$(NULL)
-
-# Note the sophisticated alphabetical ordering :-|
-CPPSRCS =				\
-	nsXULAtoms.cpp			\
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-#EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE=layout
-
-REQUIRES = xpcom raptor dom
-
-MKSHLIB :=
+CPPSRCS		= nsXULAtoms.cpp

 # we don't want the shared lib, but we want to force the creation of a static lib.
 override NO_SHARED_LIB=1
 override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+INCLUDES	+= -I$(srcdir)/../../../base/src -I$(DIST)/public/raptor
+
--- a/lib/libpwcac/Makefile.in
+++ b/lib/libpwcac/Makefile.in
@ -1,31 +0,0 @@
-#
-# 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@
-VPATH		= @srcdir@
-srcdir		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= pwcac
-LIBRARY_NAME	= pwcac
-
-CSRCS		= pwcacapi.c
-
-REQUIRES	= js img layer util pref security
-
-include $(topsrcdir)/config/rules.mk
--- a/lib/xp/Makefile.in
+++ b/lib/xp/Makefile.in
@ -1,41 +0,0 @@
-#
-# 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
-
-include $(topsrcdir)/config/config.mk
-
-MODULE		= xp
-LIBRARY_NAME	= xp_s
-
-CSRCS		+= \
-      xp_regexp.c \
-		  $(NULL)
-
-MKSHLIB :=
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-EXPORTS		= xp_linebuf.h
-
-include $(topsrcdir)/config/rules.mk
-