8 files changed, 66 insertions, 78 deletions
diff --git a/ucb/source/cacher/exports.map b/ucb/source/cacher/exports.map
new file mode 100644
index 000000000000..bd32ad4747a6
--- /dev/null
+++ b/ucb/source/cacher/exports.map
@@ -0,0 +1,8 @@
+CAC_1_0 {
+    global:
+        component_getImplementationEnvironment;
+        component_writeInfo;
+        component_getFactory;
+    local:
+        *;
+};
diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk
index f9e70e8dd746..390b07c0c37b 100644
--- a/ucb/source/cacher/makefile.mk
+++ b/ucb/source/cacher/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: hjs $ $Date: 2002-05-15 17:21:29 $
+#   last change: $Author: kso $ $Date: 2002-06-25 13:03:40 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -73,8 +73,6 @@ UCB_MAJOR=1
 .INCLUDE: settings.mk
 .INCLUDE: sv.mk
 
-#INCPRE+=$(PRJ)$/source$/inc
-
 SLOFILES=\
     $(SLO)$/contentresultsetwrapper.obj \
     $(SLO)$/cachedcontentresultsetstub.obj \
@@ -97,11 +95,13 @@ SHL1STDLIBS=\
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=i$(TARGET)
 
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
+.IF "$(OS)"=="MACOSX"
+.ELSE
+SHL1VERSIONMAP=exports.map
+.ENDIF
+
 DEF1NAME=$(SHL1TARGET)
-DEF1EXPORT1 =component_getImplementationEnvironment
-DEF1EXPORT2 =component_writeInfo
-DEF1EXPORT3 =component_getFactory
+DEF1EXPORTFILE=exports.dxp
 DEF1DES=Cached Dynamic Resultset
 
 # Make symbol renaming match library name for Mac OS X
@@ -111,7 +111,3 @@ SYMBOLPREFIX=$(TARGET)$(UCB_MAJOR)
 
 .INCLUDE: target.mk
 
-$(MISC)$/$(SHL1TARGET).flt:
-    @echo ------------------------------
-    @echo Making: $@
-    $(TYPE) cached1.flt > $@
diff --git a/ucb/source/core/exports.map b/ucb/source/core/exports.map
new file mode 100644
index 000000000000..5ab48b9e42c0
--- /dev/null
+++ b/ucb/source/core/exports.map
@@ -0,0 +1,8 @@
+UCB_1_0 {
+    global:
+        component_getImplementationEnvironment;
+        component_writeInfo;
+        component_getFactory;
+    local:
+        *;
+};
diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk
index 11a0c84a0a39..16498d251f1f 100644
--- a/ucb/source/core/makefile.mk
+++ b/ucb/source/core/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.13 $
+#   $Revision: 1.14 $
 #
-#   last change: $Author: kso $ $Date: 2001-06-27 07:52:50 $
+#   last change: $Author: kso $ $Date: 2002-06-25 13:04:15 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -79,14 +79,9 @@ SLOFILES=\
     $(SLO)$/ucbserv.obj \
     $(SLO)$/ucbstore.obj \
     $(SLO)$/ucbprops.obj \
-    $(SLO)$/provprox.obj
-
-.IF "$(UPD)">="619"
-SLOFILES+=$(SLO)$/ucbcmds.obj \
+        $(SLO)$/provprox.obj \
+        $(SLO)$/ucbcmds.obj \
     $(SLO)$/coreremotecontentbroker.obj
-.ELSE
-SLOFILES+=$(SLO)$/ucbcfg.obj
-.ENDIF
 
 LIB1TARGET=$(SLB)$/_$(TARGET).lib
 LIB1OBJFILES=$(SLOFILES)
@@ -103,11 +98,13 @@ SHL1LIBS=\
     $(SLB)$/regexp.lib
 SHL1IMPLIB=i$(TARGET)
 
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
+.IF "$(OS)"=="MACOSX"
+.ELSE
+SHL1VERSIONMAP=exports.map
+.ENDIF
+
 DEF1NAME=$(SHL1TARGET)
-DEF1EXPORT1 =component_getImplementationEnvironment
-DEF1EXPORT2 =component_writeInfo
-DEF1EXPORT3 =component_getFactory
+DEF1EXPORTFILE=exports.dxp
 DEF1DES=Universal Content Broker
 
 # Make symbol renaming match library name for Mac OS X
@@ -117,17 +114,3 @@ SYMBOLPREFIX=$(TARGET)$(UCB_MAJOR)
 
 .INCLUDE: target.mk
 
-$(MISC)$/$(SHL1TARGET).flt:
-    @echo ------------------------------
-    @echo Making: $@
-#	@echo Type >> $@
-    @echo cpp >> $@
-    @echo m_ >> $@
-    @echo rtl >> $@
-    @echo vos >> $@
-    @echo component_getImplementationEnvironment >> $@
-    @echo component_writeInfo >> $@
-    @echo component_getFactory >> $@
-.IF "$(COM)"=="MSC"
-    @echo ??_ >> $@
-.ENDIF # COM MSC
diff --git a/ucb/source/sorter/exports.map b/ucb/source/sorter/exports.map
new file mode 100644
index 000000000000..953380b4a923
--- /dev/null
+++ b/ucb/source/sorter/exports.map
@@ -0,0 +1,8 @@
+SRT_1_0 {
+    global:
+        component_getImplementationEnvironment;
+        component_writeInfo;
+        component_getFactory;
+    local:
+        *;
+};
diff --git a/ucb/source/sorter/makefile.mk b/ucb/source/sorter/makefile.mk
index 88e03c36e03e..8eccf53b399a 100644
--- a/ucb/source/sorter/makefile.mk
+++ b/ucb/source/sorter/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: pluby $ $Date: 2001-03-07 08:53:58 $
+#   last change: $Author: kso $ $Date: 2002-06-25 13:04:35 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -97,11 +97,13 @@ SHL1STDLIBS+=$(TOOLSLIB)
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=i$(TARGET)
 
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
+.IF "$(OS)"=="MACOSX"
+.ELSE
+SHL1VERSIONMAP=exports.map
+.ENDIF
+
 DEF1NAME=$(SHL1TARGET)
-DEF1EXPORT1 =component_getImplementationEnvironment
-DEF1EXPORT2 =component_writeInfo
-DEF1EXPORT3 =component_getFactory
+DEF1EXPORTFILE=exports.dxp
 DEF1DES=UCB : Sorted Dynamic ResultSet
 
 # Make symbol renaming match library name for Mac OS X
@@ -111,16 +113,3 @@ SYMBOLPREFIX=$(TARGET)$(UCB_MAJOR)
 
 .INCLUDE: target.mk
 
-$(MISC)$/$(SHL1TARGET).flt:
-    @echo ------------------------------
-    @echo Making: $@
-#	@echo Type >> $@
-    @echo cpp >> $@
-    @echo m_ >> $@
-    @echo rtl >> $@
-    @echo component_getImplementationEnvironment >> $@
-    @echo component_writeInfo >> $@
-    @echo component_getFactory >> $@
-.IF "$(COM)"=="MSC"
-    @echo ??_ >> $@
-.ENDIF # COM MSC
diff --git a/ucb/source/ucp/file/exports.map b/ucb/source/ucp/file/exports.map
new file mode 100644
index 000000000000..a8bd267fc9e9
--- /dev/null
+++ b/ucb/source/ucp/file/exports.map
@@ -0,0 +1,8 @@
+FIL_1_0 {
+    global:
+        component_getImplementationEnvironment;
+        component_writeInfo;
+        component_getFactory;
+    local:
+        *;
+};
diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk
index 7ad512fbf6ef..6e13a37790df 100644
--- a/ucb/source/ucp/file/makefile.mk
+++ b/ucb/source/ucp/file/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: abi $ $Date: 2001-11-19 11:11:29 $
+#   last change: $Author: kso $ $Date: 2002-06-25 13:04:58 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -104,11 +104,13 @@ SHL1STDLIBS=\
     $(UCBHELPERLIB)	\
     $(UNOTOOLSLIB)
 
-DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
+.IF "$(OS)"=="MACOSX"
+.ELSE
+SHL1VERSIONMAP=exports.map
+.ENDIF
+
 DEF1NAME=$(SHL1TARGET)
-DEF1EXPORT1 =component_getImplementationEnvironment
-DEF1EXPORT2 =component_writeInfo
-DEF1EXPORT3 =component_getFactory
+DEF1EXPORTFILE=exports.dxp
 DEF1DES=UCB : File System Content Provider
 
 # Make symbol renaming match library name for Mac OS X
@@ -118,17 +120,3 @@ SYMBOLPREFIX=$(TARGET)$(UCPFILE_MAJOR)
 
 .INCLUDE: target.mk
 
-$(MISC)$/$(SHL1TARGET).flt:
-    @echo ------------------------------
-    @echo Making: $@
-#	@echo Type >> $@
-    @echo cpp >> $@
-    @echo m_ >> $@
-    @echo rtl >> $@
-    @echo vos >> $@
-    @echo component_getImplementationEnvironment >> $@
-    @echo component_writeInfo >> $@
-    @echo component_getFactory >> $@
-.IF "$(COM)"=="MSC"
-    @echo ??_ >> $@
-.ENDIF # COM MSC