changes for library description

16 files changed, 51 insertions, 132 deletions

diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk
index 57a2ff713544..06cbd6782be2 100644
--- a/stoc/source/corereflection/makefile.mk
+++ b/stoc/source/corereflection/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:35:45 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,24 +70,19 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
 SLOFILES=	\
         $(SLO)$/crefl.obj	\
         $(SLO)$/crbase.obj	\
         $(SLO)$/crarray.obj	\
         $(SLO)$/crcomp.obj	\
         $(SLO)$/criface.obj	\
-        $(SLO)$/crenum.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/crenum.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/defaultregistry/makefile.mk b/stoc/source/defaultregistry/makefile.mk
index 38e8802a3c3b..af00111c3189 100644
--- a/stoc/source/defaultregistry/makefile.mk
+++ b/stoc/source/defaultregistry/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:37:02 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,20 +71,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
-        $(SLO)$/defaultregistry.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/defaultregistry.obj
 
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
diff --git a/stoc/source/implementationregistration/makefile.mk b/stoc/source/implementationregistration/makefile.mk
index 49f14cc399c4..263970904376 100644
--- a/stoc/source/implementationregistration/makefile.mk
+++ b/stoc/source/implementationregistration/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:38:36 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:38 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,20 +71,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
-        $(SLO)$/implreg.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/implreg.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk
index e6f2ed53c6c1..edb19121c79c 100644
--- a/stoc/source/inspect/makefile.mk
+++ b/stoc/source/inspect/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:39:18 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:38 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,20 +70,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
-        $(SLO)$/introspection.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/introspection.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk
index 5f8fd420f583..8174c802cbfa 100644
--- a/stoc/source/invocation/makefile.mk
+++ b/stoc/source/invocation/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:40:16 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:39 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,20 +70,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
-        $(SLO)$/invocation.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/invocation.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk
index a4a0fdc54c34..60df6a3b2328 100644
--- a/stoc/source/invocation_adapterfactory/makefile.mk
+++ b/stoc/source/invocation_adapterfactory/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:41:19 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:39 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,20 +70,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES=	\
-        $(SLO)$/iafactory.obj	\
-               $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/iafactory.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk
index 516a7be5c4a3..e75ac219b68a 100644
--- a/stoc/source/javaloader/makefile.mk
+++ b/stoc/source/javaloader/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: kr $ $Date: 2000-09-28 17:32:25 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:40 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,9 +70,7 @@ NO_BSYMBOLIC=TRUE
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk
index 86d72bb9edab..e5ecf62f8916 100644
--- a/stoc/source/javavm/makefile.mk
+++ b/stoc/source/javavm/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: kr $ $Date: 2000-09-28 17:36:14 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:40 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -68,9 +68,8 @@ USE_DEFFILE=TRUE
 NO_BSYMBOLIC=TRUE
 
 # --- Settings -----------------------------------------------------
-.INCLUDE :  svpre.mk
+
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # --- Files --------------------------------------------------------
 
@@ -102,9 +101,10 @@ UNOTYPES= \
 
 SLOFILES= \
         $(SLO)$/javavm.obj		\
-        $(SLO)$/jvmargs.obj		\
-        $(SLO)$/jen_desc.obj		
+        $(SLO)$/jvmargs.obj	
+                
 
+SHL1DESCRIPTIONOBJ=$(SLO)$/jen_desc.obj
 SHL1TARGET= $(TARGET)
 
 SHL1STDLIBS= \
diff --git a/stoc/source/loader/makefile.mk b/stoc/source/loader/makefile.mk
index ffeefbd6b184..6b0d40ca1535 100644
--- a/stoc/source/loader/makefile.mk
+++ b/stoc/source/loader/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:41:55 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,19 +71,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
 SLOFILES= \
-        $(SLO)$/dllcomponentloader.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/dllcomponentloader.obj
 
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk
index 347bdd9617d3..4cc6d4d6dab8 100644
--- a/stoc/source/namingservice/makefile.mk
+++ b/stoc/source/namingservice/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:42:35 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,19 +70,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
 SLOFILES= \
-        $(SLO)$/namingservice.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/namingservice.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk
index cdb6910a4b17..389b09a72ac9 100644
--- a/stoc/source/proxy_factory/makefile.mk
+++ b/stoc/source/proxy_factory/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:43:12 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:41 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -72,20 +72,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
-        $(SLO)$/proxyfac.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/proxyfac.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/registry_tdprovider/makefile.mk b/stoc/source/registry_tdprovider/makefile.mk
index bef5eaf7b3bb..4839c12d3554 100644
--- a/stoc/source/registry_tdprovider/makefile.mk
+++ b/stoc/source/registry_tdprovider/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:44:24 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:42 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,24 +71,18 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES=	\
         $(SLO)$/tdprovider.obj	\
         $(SLO)$/tdef.obj	\
         $(SLO)$/tdenum.obj	\
         $(SLO)$/tdcomp.obj	\
-        $(SLO)$/tdiface.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/tdiface.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/servicemanager/makefile.mk b/stoc/source/servicemanager/makefile.mk
index a736117bd79c..34431a18d229 100644
--- a/stoc/source/servicemanager/makefile.mk
+++ b/stoc/source/servicemanager/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:45:06 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:43 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,20 +71,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
-        $(SLO)$/servicemanager.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/servicemanager.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/simpleregistry/makefile.mk b/stoc/source/simpleregistry/makefile.mk
index 927b09591c3b..40df2d4681db 100644
--- a/stoc/source/simpleregistry/makefile.mk
+++ b/stoc/source/simpleregistry/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:45:47 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:43 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,20 +71,15 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
-        $(SLO)$/simpleregistry.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/simpleregistry.obj
+
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/tdmanager/makefile.mk b/stoc/source/tdmanager/makefile.mk
index 5fe0ea5b5d7b..e84452e6b79b 100644
--- a/stoc/source/tdmanager/makefile.mk
+++ b/stoc/source/tdmanager/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:48:11 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:44 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,21 +71,15 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
-
 SLOFILES= \
         $(SLO)$/tdmgr.obj	\
-        $(SLO)$/transfer.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/transfer.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
diff --git a/stoc/source/typeconv/makefile.mk b/stoc/source/typeconv/makefile.mk
index 1b6a74609299..6af6399f9a74 100644
--- a/stoc/source/typeconv/makefile.mk
+++ b/stoc/source/typeconv/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: ganaya $ $Date: 2000-10-10 05:48:53 $
+#   last change: $Author: hjs $ $Date: 2000-10-30 14:20:44 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,19 +70,14 @@ COMP1TYPELIST=$(TARGET)
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-.INCLUDE :  sv.mk
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  ..$/cppumaker.mk
 
-UNOTYPES=$($(TARGET)_XML2CMPTYPES)
-
 SLOFILES= \
-        $(SLO)$/convert.obj	\
-           $(SLO)$/$(COMP1TYPELIST)_description.obj
+        $(SLO)$/convert.obj
 # NETBSD: somewhere we have to instantiate the static data members.
 # NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
 # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols