INTEGRATION: CWS jl49 (1.10.8); FILE MERGED

2006/11/27 13:11:05 sb 1.10.8.6: #i70481# Added XPackage.getIdentifier.
2006/11/24 10:38:00 sb 1.10.8.5: #i70481# Next step of dp_gui_updatedialog, various changes to related code.
2006/11/23 15:16:26 sb 1.10.8.4: #i70481# Introduced additional deploymentmisc shared library: fixes for wntmsci10.
2006/11/22 17:33:38 sb 1.10.8.3: #i70481# Introduced additional deploymentmisc shared library.
2006/11/20 13:15:13 sb 1.10.8.2: RESYNC: (1.10-1.11); FILE MERGED
2006/11/16 14:20:32 sb 1.10.8.1: #i70481# Moved extracting information from XML description element to DescriptionInfoset.

desktop/source/deployment/misc/makefile.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: kz $ $Date: 2006-11-06 14:55:20 $
+#   last change: $Author: ihi $ $Date: 2006-12-20 14:29:51 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -37,11 +37,19 @@ PRJ = ..$/..$/..
 
 PRJNAME = desktop
 TARGET = deployment_misc
+USE_DEFFILE = TRUE
 ENABLE_EXCEPTIONS = TRUE
-LIBTARGET = NO
 
 .INCLUDE : settings.mk
 
+# Reduction of exported symbols:
+CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION
+.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+CFLAGS += -fvisibility=hidden
+.ELIF "$(COMNAME)" == "sunpro5" && "$(CCNUMVER)" >= "00050005"
+CFLAGS += -xldscope=hidden
+.ENDIF
+
 .IF "$(SYSTEM_DB)" == "YES"
 CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
 .ENDIF
@@ -50,22 +58,29 @@ SRS1NAME = $(TARGET)
 SRC1FILES = \
     dp_misc.src
 
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-LIB1OBJFILES = \
+SHL1TARGET = deploymentmisc$(UPD)$(DLLPOSTFIX)
+SHL1OBJS = \
         $(SLO)$/dp_misc.obj \
         $(SLO)$/dp_resource.obj \
         $(SLO)$/dp_interact.obj \
         $(SLO)$/dp_ucb.obj \
-        $(SLO)$/dp_xml.obj \
-        $(SLO)$/dp_log.obj \
-        $(SLO)$/dp_persmap.obj \
-        $(SLO)$/dp_services.obj       \
         $(SLO)$/db.obj \
-        $(SLO)$/dp_version.obj
-
-SLOFILES = $(LIB1OBJFILES)
+        $(SLO)$/dp_version.obj \
+        $(SLO)$/dp_descriptioninfoset.obj \
+        $(SLO)$/dp_dependencies.obj
+SHL1STDLIBS = \
+    $(BERKELEYLIB) \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(SALLIB) \
+    $(TOOLSLIB) \
+    $(UCBHELPERLIB) \
+    $(UNOTOOLSLIB) \
+    $(XMLSCRIPTLIB)
+SHL1IMPLIB = i$(SHL1TARGET)
+DEF1NAME = $(SHL1TARGET)
 
-OBJFILES = $(OBJ)$/dp_version.obj
+SLOFILES = $(SHL1OBJS)
 
 .INCLUDE : ..$/target.pmk
 .INCLUDE : target.mk