INTEGRATION: CWS sb83 (1.74.34); FILE MERGED

2008/02/08 09:17:00 sb 1.74.34.7: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/07 16:22:45 sb 1.74.34.6: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
2008/02/01 13:29:35 sb 1.74.34.5: RESYNC: (1.75-1.77); FILE MERGED
2008/01/29 14:46:29 sb 1.74.34.4: #i84200# /DELAYLOAD:uwinapi.dll is not used at all any longer
2008/01/23 15:19:23 sb 1.74.34.3: #i84200# moved executables from brand layer to basis layer
2007/12/21 14:59:06 sb 1.74.34.2: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop; moved everything relevant from module sal there) (but needed on all Windows platforms).
2007/12/03 13:46:30 sb 1.74.34.1: #i84200# First step of basis/brand split.

1 files changed, 17 insertions, 102 deletions

diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 736cbaa09b9a..783c8df73889 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.78 $
+#   $Revision: 1.79 $
 #
-#   last change: $Author: obo $ $Date: 2008-02-27 10:28:40 $
+#   last change: $Author: vg $ $Date: 2008-03-18 13:51:58 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -38,6 +38,7 @@ PRJ=..
 PRJNAME=desktop
 TARGET=soffice
 TARGETTYPE=GUI
+LIBTARGET=NO
 GEN_HID=TRUE
 GEN_HID_OTHER=TRUE
 
@@ -45,33 +46,9 @@ GEN_HID_OTHER=TRUE
 
 .INCLUDE :  settings.mk
 
-VERINFONAME=verinfo
+UWINAPILIB =
 
-TARGETOBJS=	\
-            $(OBJ)$/main.obj				\
-            $(OBJ)$/app.obj					\
-            $(OBJ)$/appfirststart.obj		\
-            $(OBJ)$/lockfile.obj			\
-            $(OBJ)$/lockfile2.obj			\
-            $(OBJ)$/intro.obj				\
-            $(OBJ)$/officeipcthread.obj		\
-            $(OBJ)$/appinit.obj				\
-            $(OBJ)$/cmdlineargs.obj			\
-            $(OBJ)$/oinstanceprovider.obj	\
-            $(OBJ)$/opluginframefactory.obj	\
-            $(OBJ)$/appsys.obj				\
-            $(OBJ)$/desktopresid.obj		\
-            $(OBJ)$/dispatchwatcher.obj		\
-            $(OBJ)$/configinit.obj			\
-            $(OBJ)$/checkinstall.obj		\
-            $(OBJ)$/cmdlinehelp.obj         \
-            $(OBJ)$/langselect.obj          \
-            $(OBJ)$/userinstall.obj         \
-            $(OBJ)$/desktopcontext.obj      \
-            $(SLO)$/pages.obj               \
-            $(SLO)$/wizard.obj              \
-            $(SLO)$/migration.obj           \
-            $(SLO)$/cfgfilter.obj
+VERINFONAME=verinfo
 
 # --- Resourcen ----------------------------------------------------
 
@@ -82,20 +59,6 @@ RCFILES=verinfo.rc
 RCFILES=ooverinfo2.rc
 .ENDIF
 
-# --- Linking of static libs ---------------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1OBJFILES=$(TARGETOBJS)
-LIB1OBJFILES += $(OBJ)$/copyright_ascii_sun.obj
-
-#LIB2TARGET=$(SLB)$/officeloader.lib
-#LIB2OBJFILES=$(OBJ)$/officeloader.obj
-
-
-.ENDIF
-
 # --- Linken der Applikation ---------------------------------------
 
 .IF "$(OS)" == "MACOSX"
@@ -122,25 +85,9 @@ RESLIB1SRSFILES=	$(SRS)$/desktop.srs \
 .IF "$(GUI)" != "OS2"
 APP1TARGET=so$/$(TARGET)
 APP1NOSAL=TRUE
-APP1STDLIBS=			\
-    $(VCLLIB)			\
-    $(SVLLIB)           \
-    $(SVTOOLLIB)        \
-    $(UNOTOOLSLIB)		\
-    $(TOOLSLIB)			\
-    $(I18NISOLANGLIB)   \
-    $(COMPHELPERLIB)	\
-    $(UCBHELPERLIB)		\
-    $(VOSLIB)			\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(TKLIB)            \
-    $(SALLIB)           \
-    $(SFXLIB)
-
-APP1OBJS=$(TARGETOBJS)
-APP1OBJS += $(OBJ)$/copyright_ascii_sun.obj
-
+APP1RPATH=BRAND
+APP1OBJS=$(OBJ)$/copyright_ascii_sun.obj $(OBJ)$/main.obj
+APP1STDLIBS = $(SALLIB) $(SOFFICELIB)
 .IF "$(GUI)" == "UNX"
 .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
 APP1STDLIBS+= -lXext -lSM -lICE
@@ -167,25 +114,9 @@ APP1STACK=10000000
 
 APP5TARGET=soffice
 APP5NOSAL=TRUE
-APP5STDLIBS=			\
-    $(VCLLIB)			\
-    $(SVLLIB)			\
-    $(SVTOOLLIB)        \
-    $(UNOTOOLSLIB)      \
-    $(TOOLSLIB)			\
-    $(I18NISOLANGLIB)   \
-    $(COMPHELPERLIB)	\
-    $(UCBHELPERLIB)		\
-    $(VOSLIB)			\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)			\
-    $(TKLIB)            \
-    $(SFXLIB)
-
-APP5OBJS=$(TARGETOBJS)
-APP5OBJS += $(OBJ)$/copyright_ascii_ooo.obj
-
+APP5RPATH=BRAND
+APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj
+APP5STDLIBS = $(SALLIB) $(SOFFICELIB)
 .IF "$(OS)" == "LINUX"
 APP5STDLIBS+= -lXext -lSM -lICE
 .ENDIF # LINUX
@@ -217,14 +148,10 @@ APP6DEPN= $(APP1TARGETN) $(APP6RES) verinfo.rc
 APP6VERINFO=verinfo.rc
 APP6LINKRES=$(MISC)$/soffice6.res
 APP6ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico
-.IF "$(COM)"=="GCC"
 APP6OBJS = \
-        $(OBJ)$/officeloader.obj
-.ELSE
-APP6OBJS = \
-        $(OBJ)$/officeloader.obj $(OBJ)$/extendloaderenvironment.obj
-.ENDIF
-STDLIB6=$(ADVAPI32LIB) $(SHLWAPILIB)
+    $(OBJ)$/extendloaderenvironment.obj \
+    $(OBJ)$/officeloader.obj
+STDLIB6=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB)
 
 APP7TARGET=officeloader
 APP7RES=$(RES)$/ooloader.res
@@ -233,22 +160,10 @@ APP7DEPN= $(APP1TARGETN) $(APP7RES) ooverinfo.rc
 APP7VERINFO=ooverinfo.rc
 APP7LINKRES=$(MISC)$/ooffice7.res
 APP7ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
-.IF "$(COM)"=="GCC"
 APP7OBJS = \
-        $(OBJ)$/officeloader.obj
-.ELSE
-APP7OBJS = \
-        $(OBJ)$/officeloader.obj $(OBJ)$/extendloaderenvironment.obj
-.ENDIF
-STDLIB7=$(ADVAPI32LIB) $(SHLWAPILIB)
-
-# Until every DLL is linked against $(DELAYLOADOBJ) just as on wntmsci10:
-.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI"
-.IF "$(CCNUMVER)" > "001399999999"
-APP6OBJS+=$(L)$/delayload.obj
-APP7OBJS+=$(L)$/delayload.obj
-.ENDIF # "$(CCNUMVER)" > "001399999999"
-.ENDIF
+    $(OBJ)$/extendloaderenvironment.obj \
+    $(OBJ)$/officeloader.obj
+STDLIB7=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB)
 .ENDIF # WNT
 
 # --- Targets -------------------------------------------------------------