Changed to a static library for now.

rdf/base/public/MANIFEST

@@ -6,4 +6,3 @@ nsIRDFNode.h
 nsIRDFObserver.h
 nsIRDFResourceManager.h
 nsIRDFXMLSource.h
-nsRDFBaseCID.h

rdf/base/public/Makefile.in

@@ -33,7 +33,6 @@ EXPORTS =			\
 	nsIRDFObserver.h        \
         nsIRDFResourceManager.h \
         nsIRDFXMLSource.h       \
-        nsRDFBaseCID.h          \
         $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

rdf/base/public/makefile.win

@@ -30,7 +30,6 @@ EXPORTS=\
 	nsIRDFObserver.h        \
         nsIRDFResourceManager.h \
         nsIRDFXMLSource.h       \
-        nsRDFBaseCID.h          \
 	$(NULL)
 
 include <$(DEPTH)/config/rules.mak>

rdf/base/src/Makefile.in

@@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = rdfbase
+LIBRARY_NAME = rdfbase_s
 
 CPPSRCS =				\
 	nsContainerCursor.cpp		\
@@ -43,15 +43,11 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
 MODULE = rdfbase
 
-REQUIRES = dom js netlib rdf raptor xpcom
+REQUIRES = rdf raptor xpcom
+
+MKSHLIB :=
+
+# we don't want the shared lib
+NO_SHARED_LIB=1
 
 include $(topsrcdir)/config/rules.mk
-
-
-export::
-
-install:: $(TARGETS)
-
-
-clobber::
-

rdf/base/src/makefile.win

@@ -16,40 +16,27 @@
 # Reserved.
 
 DEPTH=..\..\..
-MODULE=rdfbase
+MODULE=rdf
-
+LIBRARY_NAME=rdfbase_s
-MAKE_OBJ_TYPE=DLL
-DLLNAME=$(MODULE)
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsContainerCursor.obj         \
         .\$(OBJDIR)\nsEmptyCursor.obj             \
         .\$(OBJDIR)\nsMemoryDataSource.obj        \
-        .\$(OBJDIR)\nsRDFBaseFactory.obj          \
         .\$(OBJDIR)\nsRDFResourceManager.obj      \
         .\$(OBJDIR)\nsSimpleDataBase.obj          \
         .\$(OBJDIR)\rdfutil.obj                   \
 	$(NULL)
 
-LLIBS=\
- $(DIST)\lib\xpcom32.lib         \
- $(DIST)\lib\raptorbase.lib      \
- $(DIST)\lib\libplc21.lib        \
- $(LIBNSPR)  
-
 LINCS=  -I$(PUBLIC)\rdf          \
         -I$(PUBLIC)\xpcom        \
-        -I$(PUBLIC)\netlib       \
         -I$(PUBLIC)\raptor       \
         $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
+libs:: $(LIBRARY)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-
-
-
 
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

rdf/base/src/nsContainerCursor.cpp

@@ -22,7 +22,7 @@
 #include "nsIRDFNode.h"
 #include "nsIRDFResourceManager.h"
 #include "nsIServiceManager.h"
-#include "nsRDFBaseCID.h"
+#include "nsRDFCID.h"
 #include "nsString.h"
 #include "prlog.h"
 #include "rdf.h"

rdf/base/src/nsMemoryDataSource.cpp

@@ -38,7 +38,7 @@
 #include "nsIRDFNode.h"
 #include "nsIServiceManager.h"
 #include "nsISupportsArray.h"
-#include "nsRDFBaseCID.h"
+#include "nsRDFCID.h"
 #include "nsString.h"
 #include "rdfutil.h"
 #include "plhash.h"

rdf/content/public/MANIFEST

@@ -1,4 +1,3 @@
 nsIRDFContent.h
 nsIRDFContentSink.h
 nsIRDFDocument.h
-nsRDFContentCID.h

rdf/content/public/Makefile.in

@@ -28,7 +28,6 @@ EXPORTS =				\
 	nsIRDFContent.h			\
 	nsIRDFContentSink.h		\
 	nsIRDFDocument.h		\
-        nsRDFContentCID.h		\
         $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

rdf/content/public/makefile.win

@@ -24,7 +24,6 @@ EXPORTS	= \
         nsIRDFContent.h         \
         nsIRDFContentSink.h     \
         nsIRDFDocument.h        \
-        nsRDFContentCID.h       \
 	$(NULL)
 
 include <$(DEPTH)/config/rules.mak>

rdf/content/src/Makefile.in

@@ -24,7 +24,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = rdf
+LIBRARY_NAME = rdfcontent_s
 
 CPPSRCS =				\
 	nsRDFContentFactory.cpp		\
@@ -45,13 +45,10 @@ MODULE = rdf
 
 REQUIRES = dom js netlib rdf raptor xpcom
 
+MKSHLIB :=
+
+# we don't want the shared lib
+NO_SHARED_LIB=1
+
 include $(topsrcdir)/config/rules.mk
 
-
-export::
-
-install:: $(TARGETS)
-
-
-clobber::
-

rdf/content/src/makefile.win

@@ -16,14 +16,10 @@
 # Reserved.
 
 DEPTH=..\..\..
-MODULE=rdfcontent
+MODULE=rdf
-
+LIBRARY_NAME=rdfcontent_s
-MAKE_OBJ_TYPE=DLL
-DLLNAME=$(MODULE)
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 CPP_OBJS=\
-        .\$(OBJDIR)\nsRDFContentFactory.obj       \
         .\$(OBJDIR)\nsRDFContentSink.obj          \
         .\$(OBJDIR)\nsRDFDocument.obj             \
         .\$(OBJDIR)\nsRDFDocumentContentSink.obj  \
@@ -33,15 +29,6 @@ CPP_OBJS=\
         .\$(OBJDIR)\nsRDFTreeDocument.obj         \
 	$(NULL)
 
-LLIBS=\
- $(DIST)\lib\rdfbase.lib         \
- $(DIST)\lib\xpcom32.lib         \
- $(DIST)\lib\raptorbase.lib      \
- $(DIST)\lib\raptorgfxwin.lib    \
- $(DIST)\lib\netlib.lib          \
- $(DIST)\lib\libplc21.lib        \
- $(LIBNSPR)  
-
 LINCS=  -I$(PUBLIC)\rdf          \
         -I$(PUBLIC)\xpcom        \
         -I$(PUBLIC)\netlib       \
@@ -53,10 +40,10 @@ LINCS=  -I$(PUBLIC)\rdf          \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
+libs:: $(LIBRARY)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+
-
+clobber::
-
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
 
 

rdf/content/src/nsRDFDocument.cpp

@@ -43,8 +43,7 @@
 #include "nsIWebShell.h"
 #include "nsLayoutCID.h"
 #include "nsParserCIID.h"
-#include "nsRDFBaseCID.h"
+#include "nsRDFCID.h"
-#include "nsRDFContentCID.h"
 #include "nsRDFContentSink.h"
 #include "nsRDFDocument.h"
 #include "nsITextContent.h"

rdf/datasource/public/MANIFEST

@@ -1 +0,0 @@
-nsRDFDataSourceCID.h

rdf/datasource/public/Makefile.in

@@ -25,8 +25,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = rdf
 
 EXPORTS =				\
-	rdf.h				\
-        nsRDFDataSourceCID.h		\
         $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

rdf/datasource/public/makefile.win

@@ -21,7 +21,6 @@ MODULE=rdf
 DEPTH=..\..\..
 
 EXPORTS	= \
-        nsRDFDataSourceCID.h    \
 	$(NULL)
 
 include <$(DEPTH)/config/rules.mak>

rdf/datasource/src/Makefile.in

@@ -24,11 +24,10 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-LIBRARY_NAME = rdf
+LIBRARY_NAME = rdfdatasource_s
 
 CPPSRCS =				\
         nsBookmarkDataSource.cpp	\
-	nsRDFDataSourceFactory.cpp	\
 	$(NULL)
 
 EXPORTS = \
@@ -40,13 +39,11 @@ MODULE = rdf
 
 REQUIRES = dom js netlib rdf raptor xpcom
 
+MKSHLIB :=
+
+# we don't want the shared lib
+NO_SHARED_LIB=1
+
 include $(topsrcdir)/config/rules.mk
 
 
-export::
-
-install:: $(TARGETS)
-
-
-clobber::
-

rdf/datasource/src/makefile.win

@@ -16,25 +16,16 @@
 # Reserved.
 
 DEPTH=..\..\..
-MODULE=rdfdatasource
+MODULE=rdf
-
+LIBRARY_NAME=rdfdatasource_s
-MAKE_OBJ_TYPE=DLL
-DLLNAME=$(MODULE)
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsBookmarkDataSource.obj    \
-        .\$(OBJDIR)\nsRDFDataSourceFactory.obj  \
 	$(NULL)
 
-LLIBS=\
+# XXX Note the dependency on $(DEPTH)\rdf\base\src: we use rdfutil.h over
- $(DIST)\lib\rdfbase.lib        \
+# in this library: this'll go away once we formalize utilities into an
- $(DIST)\lib\xpcom32.lib        \
+# "real live" XPCOM interface.
- $(DIST)\lib\raptorbase.lib     \
- $(DIST)\lib\raptorgfxwin.lib   \
- $(DIST)\lib\netlib.lib         \
- $(DIST)\lib\libplc21.lib       \
- $(LIBNSPR)  
 
 LINCS=  -I$(PUBLIC)\rdf         \
         -I$(PUBLIC)\xpcom       \
@@ -47,9 +38,11 @@ LINCS=  -I$(PUBLIC)\rdf         \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
+libs:: $(LIBRARY)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib