diff --git a/mozilla/rdf/base/idl/makefile.win b/mozilla/rdf/base/idl/makefile.win index e664e8565c7..9489fd4870c 100644 --- a/mozilla/rdf/base/idl/makefile.win +++ b/mozilla/rdf/base/idl/makefile.win @@ -18,45 +18,19 @@ DEPTH=..\..\.. MODULE=rdf -GARBAGE= nsRDFInterfaces.h \ - nsRDFInterfaces.cpp \ +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) 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 - diff --git a/mozilla/rdf/base/makefile.win b/mozilla/rdf/base/makefile.win index 99e7f0ad31b..53073232958 100644 --- a/mozilla/rdf/base/makefile.win +++ b/mozilla/rdf/base/makefile.win @@ -20,6 +20,7 @@ DEPTH=..\.. MODULE = rdf DIRS=\ + idl \ public \ src \ $(NULL) diff --git a/mozilla/rdf/base/public/makefile.win b/mozilla/rdf/base/public/makefile.win index f97c55dbe03..bae7af0bf21 100644 --- a/mozilla/rdf/base/public/makefile.win +++ b/mozilla/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>