General cleanup.

1999-09-15 23:36:43 +00:00 · 1999-09-15 23:36:43 +00:00 · 49a9c60d81
--- a/rdf/Makefile.in
+++ b/rdf/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,24 +13,24 @@
 # 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 util content datasource resources chrome build
+DIRS		= base util content datasource resources chrome build

 ifdef MOZ_BRPROF
-DIRS += brprof
+DIRS		+= brprof
 endif

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

-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/base/Makefile.in
+++ b/rdf/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 = idl public src
-
-include $(topsrcdir)/config/config.mk
+DIRS		= idl public src

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/base/public/Makefile.in
+++ b/rdf/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,24 +13,24 @@
 # 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 = rdf
+MODULE		= rdf

-EXPORTS =				\
-        rdf.h                   	\
-	nsIRDFContentSink.h		\
-	nsRDFInterfaces.h		\
-        $(NULL)
+EXPORTS		= \
+		rdf.h \
+		nsIRDFContentSink.h \
+		nsRDFInterfaces.h \
+		$(NULL)

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

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/base/src/Makefile.in
+++ b/rdf/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,42 +13,33 @@
 # 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		= rdfbase
+LIBRARY_NAME	= rdfbase_s

-LIBRARY_NAME = rdfbase_s
+REQUIRES	= netlib rdf rdfutil raptor xpcom

-CPPSRCS =				\
-	nsCompositeDataSource.cpp       \
-	nsContainerEnumerator.cpp	\
-	nsDefaultResourceFactory.cpp	\
-	nsInMemoryDataSource.cpp        \
-	nsRDFContentSink.cpp		\
-	nsRDFContainer.cpp		\
-	nsRDFContainerUtils.cpp		\
-	nsRDFParserUtils.cpp		\
-	nsRDFService.cpp                \
-	nsRDFXMLDataSource.cpp		\
-	rdfutil.cpp			\
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = rdfbase
-
-REQUIRES = netlib rdf rdfutil raptor xpcom
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsCompositeDataSource.cpp \
+		nsContainerEnumerator.cpp \
+		nsDefaultResourceFactory.cpp \
+		nsInMemoryDataSource.cpp \
+		nsRDFContentSink.cpp \
+		nsRDFContainer.cpp \
+		nsRDFContainerUtils.cpp \
+		nsRDFParserUtils.cpp \
+		nsRDFService.cpp \
+		nsRDFXMLDataSource.cpp \
+		rdfutil.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
@ -57,4 +47,3 @@ override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk

-
--- a/rdf/brprof/Makefile.in
+++ b/rdf/brprof/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 build
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src build

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/brprof/public/Makefile.in
+++ b/rdf/brprof/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,18 @@
 # 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 = brprof
+MODULE		= brprof

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

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/brprof/src/Makefile.in
+++ b/rdf/brprof/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,32 +13,21 @@
 # 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		= rdfbase
+LIBRARY_NAME	= brprof_s

-LIBRARY_NAME = brprof_s
+REQUIRES	= brprof netlib rdf rdfutil raptor xpcom

-CPPSRCS =				\
-	nsBrowsingProfile.cpp		\
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = rdfbase
-
-REQUIRES = brprof netlib rdf rdfutil raptor xpcom
-
-MKSHLIB :=
+CPPSRCS		= nsBrowsingProfile.cpp

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

 include $(topsrcdir)/config/rules.mk

-
--- a/rdf/chrome/Makefile.in
+++ b/rdf/chrome/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 build
-
-include $(topsrcdir)/config/config.mk
+DIRS		= public src build

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/chrome/build/Makefile.in
+++ b/rdf/chrome/build/Makefile.in
@ -37,12 +37,13 @@ SHARED_LIBRARY_LIBS = $(DIST)/lib/libchrome_s.a
 EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL)
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/registry.rdf $(DIST)/bin/chrome

+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+
--- a/rdf/chrome/public/Makefile.in
+++ b/rdf/chrome/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,18 @@
 # 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 = chrome
+MODULE		= chrome

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

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/chrome/src/Makefile.in
+++ b/rdf/chrome/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,28 +13,24 @@
 # 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		= rdfbase
+LIBRARY_NAME	= chrome_s

-LIBRARY_NAME = chrome_s
+REQUIRES	= chrome netlib rdf rdfutil raptor xpcom

-CPPSRCS =				\
-	nsChromeRegistry.cpp		\
-	nsChromeProtocolHandler.cpp     \
-	$(NULL)
-
-MODULE = rdfbase
-
-REQUIRES = chrome netlib rdf rdfutil raptor xpcom
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsChromeRegistry.cpp \
+		nsChromeProtocolHandler.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
@ -43,4 +38,3 @@ override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk

-
--- a/rdf/content/Makefile.in
+++ b/rdf/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/rdf/content/public/Makefile.in
+++ b/rdf/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,35 +13,35 @@
 # 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 = rdf
+MODULE		= rdf

-EXPORTS =				\
-	nsIDOMXULDocument.h		\
-	nsIDOMXULElement.h		\
-	nsIDOMXULTreeElement.h		\
-	nsIRDFContentModelBuilder.h	\
-	nsIRDFDocument.h		\
-	nsIXULParentDocument.h		\
-	nsIXULChildDocument.h		\
-	nsIXULDocumentInfo.h		\
-	nsIXULPopupListener.h		\
-	nsIDOMXULCommandDispatcher.h	\
-	nsIXULContentUtils.h		\
-	nsIXULCommandDispatcher.h	\
-	nsIStreamLoadableDocument.h	\
-	nsIXULKeyListener.h		\
-        $(NULL)
+EXPORTS		= \
+		nsIDOMXULDocument.h \
+		nsIDOMXULElement.h \
+		nsIDOMXULTreeElement.h \
+		nsIRDFContentModelBuilder.h \
+		nsIRDFDocument.h \
+		nsIXULParentDocument.h \
+		nsIXULChildDocument.h \
+		nsIXULDocumentInfo.h \
+		nsIXULPopupListener.h \
+		nsIDOMXULCommandDispatcher.h \
+		nsIXULContentUtils.h \
+		nsIXULCommandDispatcher.h \
+		nsIStreamLoadableDocument.h \
+		nsIXULKeyListener.h \
+		$(NULL)

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

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/content/src/Makefile.in
+++ b/rdf/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,57 +13,39 @@
 # 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		= rdf
+LIBRARY_NAME	= rdfcontent_s

-LIBRARY_NAME = rdfcontent_s
+REQUIRES	= dom js netlib rdf raptor xpcom locale

-CPPSRCS =				\
-	nsJSXULDocument.cpp		\
-	nsJSXULElement.cpp		\
-	nsJSXULCommandDispatcher.cpp		\
-	nsJSXULTreeElement.cpp		\
-	nsRDFDOMNodeList.cpp		\
-	nsRDFElement.cpp		\
-	nsRDFGenericBuilder.cpp		\
-	nsRDFXULBuilder.cpp		\
-	nsXULAttributes.cpp		\
-	nsXULContentUtils.cpp           \
-	nsXULDocument.cpp               \
-	nsXULSortService.cpp            \
-	nsXULDocumentInfo.cpp		\
-	nsXULPopupListener.cpp		\
-	nsXULCommandDispatcher.cpp		\
-	nsXULKeyListener.cpp		\
-	nsXULTreeElement.cpp		\
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = rdf
-
-REQUIRES = dom js netlib rdf raptor xpcom locale
-
-# XXX This is a dependency on rdfutil.h: it'll go away once that becomes
-# a first-class XPCOM interface.
-INCLUDES += -I$(srcdir)/../../base/src
-
-# XXX This is a dependency on Raptor for constructing HTML
-# content. It'll go away once we move RDF content model construction
-# outside the DOM APIs.
-INCLUDES += -I$(srcdir)/../../../layout/html/base/src
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsJSXULDocument.cpp \
+		nsJSXULElement.cpp \
+		nsJSXULCommandDispatcher.cpp \
+		nsJSXULTreeElement.cpp \
+		nsRDFDOMNodeList.cpp \
+		nsRDFElement.cpp \
+		nsRDFGenericBuilder.cpp \
+		nsRDFXULBuilder.cpp \
+		nsXULAttributes.cpp \
+		nsXULContentUtils.cpp \
+		nsXULDocument.cpp \
+		nsXULSortService.cpp \
+		nsXULDocumentInfo.cpp \
+		nsXULPopupListener.cpp \
+		nsXULCommandDispatcher.cpp \
+		nsXULKeyListener.cpp \
+		nsXULTreeElement.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
@ -72,3 +53,12 @@ override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk

+# XXX This is a dependency on rdfutil.h: it'll go away once that becomes
+# a first-class XPCOM interface.
+INCLUDES	+= -I$(srcdir)/../../base/src
+
+# XXX This is a dependency on Raptor for constructing HTML
+# content. It'll go away once we move RDF content model construction
+# outside the DOM APIs.
+INCLUDES	+= -I$(srcdir)/../../../layout/html/base/src
+
--- a/rdf/datasource/Makefile.in
+++ b/rdf/datasource/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/rdf/datasource/public/Makefile.in
+++ b/rdf/datasource/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,25 +13,25 @@
 # 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 = rdf
+MODULE		= rdf

-EXPORTS =				\
-	nsILocalStore.h			\
-	nsIRDFFileSystem.h		\
-	nsIRDFFTP.h			\
-	nsIXULContentSink.h		\
-        $(NULL)
+EXPORTS		= \
+		nsILocalStore.h \
+		nsIRDFFileSystem.h \
+		nsIRDFFTP.h \
+		nsIXULContentSink.h \
+		$(NULL)

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

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/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,26 @@
 # 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		= rdf
+LIBRARY_NAME	= rdfdatasource_s

-LIBRARY_NAME = rdfdatasource_s
+REQUIRES	= dom js netlib rdf raptor xpcom

-CPPSRCS =				\
-	nsLocalStore.cpp		\
-	nsFileSystemDataSource.cpp	\
-	nsFTPDataSource.cpp		\
-	nsXULContentSink.cpp		\
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = rdf
-
-REQUIRES = dom js netlib rdf raptor xpcom
-
-# XXX This is a dependency on rdfutil.h: it'll go away once that becomes
-# a first-class XPCOM interface.
-INCLUDES += -I$(srcdir)/../../base/src
-
-# XXX This is a dependency on nsRDFContentUtils.h. This'll go away once
-# XUL gets to live in it's own DLL like a big boy.
-INCLUDES += -I$(srcdir)/../../content/src
-
-MKSHLIB :=
+CPPSRCS		= \
+		nsLocalStore.cpp \
+		nsFileSystemDataSource.cpp \
+		nsFTPDataSource.cpp \
+		nsXULContentSink.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
@ -58,3 +40,11 @@ override NO_STATIC_LIB=

 include $(topsrcdir)/config/rules.mk

+# XXX This is a dependency on rdfutil.h: it'll go away once that becomes
+# a first-class XPCOM interface.
+INCLUDES	+= -I$(srcdir)/../../base/src
+
+# XXX This is a dependency on nsRDFContentUtils.h. This'll go away once
+# XUL gets to live in it's own DLL like a big boy.
+INCLUDES	+= -I$(srcdir)/../../content/src
+
--- a/rdf/resources/Makefile.in
+++ b/rdf/resources/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,39 +13,36 @@
 # 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
+FILES		= \
+		article.gif \
+		document.gif \
+		folder-closed.gif \
+		folder-open.gif \
+		loading.gif \
+		dom-test-1.xul \
+		dom-test-2.xul \
+		dom-test-3.xul \
+		dom-test-4.css \
+		dom-test-4.xul \
+		dom-test-5.xul \
+		dom-test-6.xul \
+		dom-test-7.xul \
+		dom-test-8.xul \
+		ignore-test.xul \
+		xpidl-test-1.xul \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

-FILES = \
-	article.gif \
-	document.gif \
-	folder-closed.gif \
-	folder-open.gif \
-	loading.gif \
-	dom-test-1.xul			\
-	dom-test-2.xul			\
-	dom-test-3.xul			\
-	dom-test-4.css			\
-	dom-test-4.xul			\
-	dom-test-5.xul			\
-	dom-test-6.xul			\
-	dom-test-7.xul			\
-	dom-test-8.xul			\
-	ignore-test.xul			\
-	xpidl-test-1.xul		\
-	$(NULL)
-
-FILES := $(addprefix $(srcdir)/, $(FILES))
-
 install::
-	$(INSTALL) $(FILES) $(DIST)/bin/res/rdf
+	$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/res/rdf

--- a/rdf/tests/Makefile.in
+++ b/rdf/tests/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,17 +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 = rdfcat rdfpoll
-
-
-include $(topsrcdir)/config/config.mk
+DIRS		= rdfcat rdfpoll

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/tests/domds/Makefile.in
+++ b/rdf/tests/domds/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,38 +13,39 @@
 # 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=rdfdomds
-LIBRARY_NAME=rdfdomds
-IS_COMPONENT=1
-DIRS = resources
+MODULE		= rdfdomds
+LIBRARY_NAME	= rdfdomds
+IS_COMPONENT	= 1

-XPIDLSRCS = \
-	nsIDOMDataSource.idl \
-	nsIDOMViewerElement.idl	\
-	$(NULL)
+DIRS		= resources

-CPPSRCS = \
-	nsRDFDOMDataSource.cpp	\
-	nsRDFDOMDataSourceFactory.cpp	\
-    nsRDFDOMResourceFactory.cpp \
-	$(NULL)
+CPPSRCS		= \
+		nsRDFDOMDataSource.cpp \
+		nsRDFDOMDataSourceFactory.cpp \
+		nsRDFDOMResourceFactory.cpp \
+		$(NULL)

-EXTRA_DSO_LDOPTS 	=	\
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-lxpcom			\
-	-L$(DIST)/lib	\
-	-lrdfutil_s		\
-	$(NULL)
+XPIDLSRCS	= \
+		nsIDOMDataSource.idl \
+		nsIDOMViewerElement.idl \
+		$(NULL)

-include $(topsrcdir)/config/config.mk
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-L$(DIST)/lib \
+		-lxpcom \
+		-lrdfutil_s \
+		$(NSPR_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/tests/domds/resources/Makefile.in
+++ b/rdf/tests/domds/resources/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,35 +13,30 @@
 # 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=rdfdomds
-IS_COMPONENT=1
+MODULE		= rdfdomds

-SAMPLES_DIR = $(DIST)/bin/res/samples/rdf
+SAMPLES_DIR	= $(DIST)/bin/res/samples/rdf

 RESOURCE_SAMPLES = \
-	DOMDataSourceViewer.xul	\
-	DOMDataSourceViewer.css	\
-	DOMDataSourceViewer.js	\
-	DOMTree.xul				\
-	$(NULL)
-
-EXPORT_RESOURCE_SAMPLES := $(addprefix $(srcdir)/,$(RESOURCE_SAMPLES))
-CLOBBER_RESOURCE_SAMPLES := $(addprefix $(SAMPLES_DIR)/, $(RESOURCE_SAMPLES))
-
-install::
-	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(SAMPLES_DIR)
-
-clobber::
-	$(RM) $(CLOBBER_RESOURCE_SAMPLES)
-
-include $(topsrcdir)/config/config.mk
+		DOMDataSourceViewer.xul \
+		DOMDataSourceViewer.css \
+		DOMDataSourceViewer.js \
+		DOMTree.xul \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk
+
+GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(RESOURCE_SAMPLES))
+
+install::
+	$(INSTALL) $(addprefix $(srcdir)/,$(RESOURCE_SAMPLES)) $(SAMPLES_DIR)
+
--- a/rdf/tests/dsds/Makefile.in
+++ b/rdf/tests/dsds/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,44 +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

-LIBRARY_NAME=rdfdsds
-IS_COMPONENT=1
+LIBRARY_NAME	= rdfdsds
+IS_COMPONENT	= 1

-CPPSRCS = \
-	nsRDFDataSourceDS.cpp	\
-	nsRDFDataSourceFactory.cpp	\
-	$(NULL)
+CPPSRCS		= \
+		nsRDFDataSourceDS.cpp \
+		nsRDFDataSourceFactory.cpp \
+		$(NULL)

-EXTRA_DSO_LDOPTS 	+=	\
-	$(NSPR_LIBS)	\
-	-L$(DIST)/bin	\
-	-lxpcom			\
-	$(NULL)
-
-SAMPLES_DIR = $(DIST)/bin/res/samples/rdf
+SAMPLES_DIR	= $(DIST)/bin/res/samples/rdf

 RESOURCE_SAMPLES = \
-	DataSourceViewer.xul	\
-	DataSourceViewer.css	\
-	$(NULL)
+		DataSourceViewer.xul \
+		DataSourceViewer.css \
+		$(NULL)

-EXPORT_RESOURCE_SAMPLES := $(addprefix $(srcdir)/,$(RESOURCE_SAMPLES))
-CLOBBER_RESOURCE_SAMPLES := $(addprefix $(SAMPLES_DIR)/, $(RESOURCE_SAMPLES))
-
-install::
-	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(SAMPLES_DIR)
-
-clobber::
-	$(RM) $(CLOBBER_RESOURCE_SAMPLES)
-
-include $(topsrcdir)/config/config.mk
+EXTRA_DSO_LDOPTS = \
+		-L$(DIST)/bin \
+		-lxpcom \
+		$(NSPR_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk
+
+GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(RESOURCE_SAMPLES))
+
+install::
+	$(INSTALL) $(addprefix $(srcdir)/,$(RESOURCE_SAMPLES)) $(SAMPLES_DIR)
+
--- a/rdf/util/Makefile.in
+++ b/rdf/util/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/rdf/util/public/Makefile.in
+++ b/rdf/util/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,18 @@
 # 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 = rdfutil
+MODULE		= rdfutil

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

 include $(topsrcdir)/config/rules.mk
+
--- a/rdf/util/src/Makefile.in
+++ b/rdf/util/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,35 +13,25 @@
 # 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		= rdfutil
+LIBRARY_NAME	= rdfutil_s

-LIBRARY_NAME = rdfutil_s
+REQUIRES	= xpcom rdf rdfutil raptor

-CPPSRCS =				\
-        nsRDFResource.cpp               \
-	$(NULL)
-
-EXPORTS = \
-	$(NULL)
-
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
-MODULE = rdfutil
-
-REQUIRES = xpcom rdf rdfutil raptor
-
-MKSHLIB :=
+CPPSRCS		= nsRDFResource.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
+
--- a/view/Makefile.in
+++ b/view/Makefile.in
@ -25,3 +25,4 @@ include $(DEPTH)/config/autoconf.mk
 DIRS		= public src

 include $(topsrcdir)/config/rules.mk
+
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@ -22,7 +22,7 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-MODULE		= raptor 
+MODULE		= raptor
 LIBRARY_NAME	= raptorview

 CPPSRCS		= \
@ -34,9 +34,7 @@ CPPSRCS		= \

 REQUIRES	= raptor xpcom

-EXTRA_DSO_LDOPTS =\
-				$(MOZ_TIMER_LIBS) \
-				$(NULL)
+EXTRA_DSO_LDOPTS = $(MOZ_TIMER_LIBS)

 include $(topsrcdir)/config/rules.mk