Generate RDF headers.

rdf/base/idl/makefile.win

@@ -18,45 +18,19 @@
 DEPTH=..\..\..
 MODULE=rdf
 
-GARBAGE=        nsRDFInterfaces.h       \
+XPIDLSRCS=      .\nsIRDFNode.idl                  \
-                nsRDFInterfaces.cpp     \
+                .\nsIRDFResource.idl              \
+                .\nsIRDFLiteral.idl               \
+                .\nsIRDFObserver.idl              \
+                .\nsIRDFDataSource.idl            \
+                .\nsIRDFCompositeDataSource.idl   \
+                .\nsIRDFService.idl               \
+                .\nsIRDFContainer.idl             \
+                .\nsIRDFContainerUtils.idl        \
+                .\nsIRDFPurgeableDataSource.idl   \
+                .\nsIRDFXMLDataSource.idl         \
+                .\nsIRDFXMLSource.idl             \
                 $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
-XPIDL=$(DIST)\bin\xpidl.exe
-
-XPIDL_INCLUDES= -I $(DEPTH)\xpcom\idl    \
-                $(NULL)
-
-XPIDLSRCS=      nsIRDFNode.idl                  \
-                nsIRDFResource.idl              \
-                nsIRDFLiteral.idl               \
-                nsIRDFObserver.idl              \
-                nsIRDFDataSource.idl            \
-                nsIRDFCompositeDataSource.idl   \
-                nsIRDFService.idl               \
-                nsIRDFContainer.idl             \
-                nsIRDFContainerUtils.idl        \
-                nsIRDFPurgeableDataSource.idl   \
-                nsIRDFXMLDataSource.idl         \
-                nsIRDFXMLSource.idl             \
-                $(NULL)
-
-XPIDL_HEADERS=$(XPIDLSRCS:.idl=.h)
-XPIDL_TYPELIBS=$(XPIDLSRCS:.idl=.xpt)
-
-.SUFFIXES: .idl .xpt
-
-.idl.h:
-        @echo +++ make: generating XPIDL headers
-        $(XPIDL) -m header $(XPIDL_INCLUDES) $**
-
-.idl.xpt:
-        @echo +++ make: generating XPIDL typelib
-        $(XPIDL) -m typelib $(XPIDL_INCLUDES) $**
-
-export:: $(XPIDL_HEADERS) $(XPIDL_TYPELIBS)
-        -for %i in ($(XPIDL_HEADERS:/=\)) do @$(MAKE_INSTALL) %i $(DEPTH)\rdf\base\public
-        -for %i in ($(XPIDL_TYPELIBS:/=\)) do @$(MAKE_INSTALL) %i $(DEPTH)\rdf\build
-

rdf/base/makefile.win

@@ -20,6 +20,7 @@ DEPTH=..\..
 MODULE = rdf
 
 DIRS=\
+        idl \
 	public \
 	src \
 	$(NULL)

rdf/base/public/makefile.win

@@ -23,20 +23,8 @@ DEPTH=..\..\..
 
 EXPORTS=\
         rdf.h                           \
-	nsIRDFCompositeDataSource.h     \
-        nsIRDFContainer.h               \
-        nsIRDFContainerUtils.h          \
-        nsIRDFContentSink.h             \
-	nsIRDFDataSource.h              \
-        nsIRDFLiteral.h                 \
-        nsIRDFNode.h                    \
-	nsIRDFObserver.h                \
-        nsIRDFPurgeableDataSource.h     \
-        nsIRDFResource.h                \
-        nsIRDFService.h                 \
-        nsIRDFXMLDataSource.h           \
-        nsIRDFXMLSource.h               \
         nsRDFInterfaces.h               \
+        nsIRDFContentSink.h             \
 	$(NULL)
 
 include <$(DEPTH)/config/rules.mak>