INTEGRATION: CWS jl49 (1.8.8); FILE MERGED

2006/11/27 14:26:21 jl 1.8.8.6: #i70481# added new file
2006/11/23 11:23:29 sb 1.8.8.5: #i70481# Centralized computation of whether a package manager is modifiable.
2006/11/22 17:50:17 sb 1.8.8.4: #i70481# Introduced additional deploymentmisc shared library.
2006/11/17 08:04:00 jl 1.8.8.3: #i70481#
2006/11/16 16:03:30 sb 1.8.8.2: #i70481# Next step of dp_gui_updatedialog; various related improvements in other code.
2006/11/06 16:21:43 sb 1.8.8.1: #i70481# Check for Update button and context menu entry.

desktop/source/deployment/gui/makefile.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.8 $
+#   $Revision: 1.9 $
 #
-#   last change: $Author: kz $ $Date: 2006-10-04 16:53:47 $
+#   last change: $Author: ihi $ $Date: 2006-12-20 14:25:53 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -42,6 +42,7 @@ ENABLE_EXCEPTIONS = TRUE
 NO_BSYMBOLIC = TRUE
 
 .INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk
 DLLPRE =
 
 SLOFILES = \
@@ -49,22 +50,25 @@ SLOFILES = \
         $(SLO)$/dp_gui_dialog.obj \
         $(SLO)$/dp_gui_treelb.obj \
         $(SLO)$/dp_gui_cmdenv.obj \
-        $(SLO)$/license_dialog.obj \
-        $(SLO)$/dp_gui_dependencydialog.obj
-
-SHL1OBJS = \
-        $(SLO)$/dp_misc.obj \
-        $(SLO)$/dp_version.obj
-
+    $(SLO)$/license_dialog.obj \
+        $(SLO)$/dp_gui_dependencydialog.obj \
+        $(SLO)$/dp_gui_thread.obj \
+        $(SLO)$/dp_gui_updatability.obj \
+        $(SLO)$/dp_gui_updatedialog.obj \
+        $(SLO)$/dp_gui_updateinstalldialog.obj \
+        $(SLO)$/dp_gui_autoscrolledit.obj \
+        $(SLO)$/dp_gui_modifiablecontext.obj
+        
 SHL1TARGET = $(TARGET)$(UPD)$(DLLPOSTFIX).uno
 SHL1VERSIONMAP = ..$/deployment.map
 
+
 SHL1STDLIBS = \
         $(SALLIB) \
+        $(SALHELPERLIB) \
         $(CPPULIB) \
         $(CPPUHELPERLIB) \
         $(UCBHELPERLIB) \
-        $(VOSLIB) \
         $(COMPHELPERLIB) \
         $(UNOTOOLSLIB) \
         $(TOOLSLIB) \
@@ -72,7 +76,9 @@ SHL1STDLIBS = \
         $(TKLIB) \
         $(VCLLIB) \
         $(SVTOOLLIB)	\
-        $(SVLLIB)			
+        $(SVLLIB)		\
+        $(SVXLIB) \
+        $(DEPLOYMENTMISCLIB)
 
 SHL1DEPN =
 SHL1IMPLIB = i$(TARGET)
@@ -88,7 +94,9 @@ SRC1FILES = \
         dp_gui_dialog.src \
         dp_gui_backend.src \
         dp_gui_dependencydialog.src \
-        dp_gui_versionboxes.src
+        dp_gui_updatedialog.src \
+        dp_gui_versionboxes.src \
+        dp_gui_updateinstalldialog.src
 
 RESLIB1NAME = $(TARGET)
 RESLIB1SRSFILES = $(SRS)$/$(TARGET).srs