From dbf9ab5c7ab95de3200a2c69932be38b378c5bd2 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 13 Mar 2009 15:52:34 +0000
Subject: CWS-TOOLING: integrate CWS mhu17 2009-01-23 14:08:09 +0100 mhu 
 r266816 : CWS-TOOLING: rebase CWS mhu17 to trunk@266428 (milestone:
 DEV300:m39) 2009-01-16 17:49:37 +0100 mhu  r266442 : #i98151# Migration to
 subversion. 2009-01-16 17:48:53 +0100 mhu  r266441 : #i98151# Migration to
 subversion. 2009-01-16 17:47:56 +0100 mhu  r266440 : #i98151# Migration to
 subversion.

---
 desktop/source/pagein/makefile.mk | 67 ++++++++++++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 19 deletions(-)

(limited to 'desktop')

diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index 85fb5169be08..729d460b3652 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -43,6 +43,8 @@ LIBSALCPPRT=$(0)
 
 .INCLUDE :  settings.mk
 
+.INCLUDE .IGNORE : icuversion.mk
+
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
@@ -70,11 +72,13 @@ ALL: \
 
 .INCLUDE :  target.mk
 
-ICUDLLPOST=$(DLLPOST).26
+ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
 UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
 UNODLLPOST=.uno$(DLLPOST)
 DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default 
 
+URELIBPATH=..$/ure-link$/lib
+
 $(MISC)$/$(TARGET)-calc : makefile.mk
     @echo Making: $@
     @-echo $(DLLPRE)sc$(DFTDLLPOST)  >  $@
@@ -95,39 +99,63 @@ $(MISC)$/$(TARGET)-writer : makefile.mk
     @-echo $(DLLPRE)sw$(DFTDLLPOST)  >  $@
     @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@
 
-# sorted in reverse load order (ld.so.1)
+# sorted in approx. reverse load order (ld.so.1)
 $(MISC)$/$(TARGET)-common : makefile.mk
     @echo Making: $@
-    @-echo $(DLLPRE)icui18n$(ICUDLLPOST)  >  $@
-    @-echo i18npool$(UNODLLPOST)       >> $@
+    @-echo i18npool$(UNODLLPOST)         >  $@
+.IF "$(SYSTEM_ICU)" != "YES"
+    @-echo $(DLLPRE)icui18n$(ICUDLLPOST) >> $@
+    @-echo $(DLLPRE)icule$(ICUDLLPOST)   >> $@
+    @-echo $(DLLPRE)icuuc$(ICUDLLPOST)   >> $@
+    @-echo $(DLLPRE)icudata$(ICUDLLPOST) >> $@
+.ENDIF # SYSTEM_ICU
 #
-    @-echo $(DLLPRE)xcr$(DFTDLLPOST)   >> $@
+    @-echo $(DLLPRE)lng$(DFTDLLPOST)   >> $@
     @-echo $(DLLPRE)xo$(DFTDLLPOST)    >> $@
-    @-echo $(DLLPRE)go$(DFTDLLPOST)    >> $@
-    @-echo $(DLLPRE)sb$(DFTDLLPOST)    >> $@
-    @-echo $(DLLPRE)sfx$(DFTDLLPOST)   >> $@
 #
+
     @-echo $(DLLPRE)fwe$(DFTDLLPOST)   >> $@
     @-echo $(DLLPRE)fwk$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)ucpfile1$(DLLPOST) >> $@
     @-echo $(DLLPRE)fwi$(DFTDLLPOST)   >> $@
     @-echo $(DLLPRE)fwl$(DFTDLLPOST)   >> $@
+    @-echo $(DLLPRE)package2$(DLLPOST) >> $@
+    @-echo $(DLLPRE)ucpfile1$(DLLPOST) >> $@
+    @-echo $(DLLPRE)ucb1$(DLLPOST)     >> $@
     @-echo configmgr2$(UNODLLPOST)     >> $@
 #
-    @-echo $(DLLPRE)icuuc$(ICUDLLPOST) >> $@
-    @-echo $(DLLPRE)sot$(DFTDLLPOST)   >> $@
-    @-echo $(DLLPRE)psp$(DFTDLLPOST)   >> $@
+    @-echo $(DLLPRE)dtransX11$(DFTDLLPOST)   >> $@
+    @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST) >> $@
+.IF "$(ENABLE_GTK)" != ""
+    @-echo $(DLLPRE)vclplug_gtk$(DFTDLLPOST) >> $@
+.ENDIF # ENABLE_GTK
+.IF "$(ENABLE_KDE)" != ""
+    @-echo $(DLLPRE)vclplug_kde$(DFTDLLPOST) >> $@
+.ENDIF # ENABLE_KDE
+#
+    @-echo $(DLLPRE)psp$(DFTDLLPOST)     >> $@
+    @-echo $(DLLPRE)basegfx$(DFTDLLPOST) >> $@
+    @-echo $(DLLPRE)sot$(DFTDLLPOST)     >> $@
+    @-echo $(DLLPRE)xcr$(DFTDLLPOST)     >> $@
+    @-echo $(DLLPRE)sb$(DFTDLLPOST)      >> $@
+#
+# uno runtime environment
+#
+    @-echo $(URELIBPATH)$/stocservices$(UNODLLPOST)         >> $@
+    @-echo $(URELIBPATH)$/bootstrap$(UNODLLPOST)            >> $@
+    @-echo $(URELIBPATH)$/$(DLLPRE)reg$(UDKDLLPOST)         >> $@
+    @-echo $(URELIBPATH)$/$(DLLPRE)store$(UDKDLLPOST)       >> $@
 .IF "$(USE_SYSTEM_STL)"!="YES"
 .IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
-    @-echo $(DLLPRE)stlport_gcc$(DLLPOST)    >> $@
+    @-echo $(URELIBPATH)$/$(DLLPRE)stlport_gcc$(DLLPOST)    >> $@
 .ENDIF # gcc
 .IF "$(COMNAME)" == "sunpro5"
-    @-echo $(DLLPRE)stlport_sunpro$(DLLPOST) >> $@
+    @-echo $(URELIBPATH)$/$(DLLPRE)stlport_sunpro$(DLLPOST) >> $@
 .ENDIF # sunpro5
-.ENDIF
-    @-echo $(DLLPRE)uno_sal$(UDKDLLPOST)   >>  $@
-    @-echo $(DLLPRE)uno_cppu$(UDKDLLPOST)  >> $@
-    @-echo $(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST)           >> $@
+.ENDIF # SYSTEM_STL
+    @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@
+    @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppu$(UDKDLLPOST)               >> $@
+    @-echo $(URELIBPATH)$/$(DLLPRE)uno_sal$(UDKDLLPOST)                >> $@
+#
     @-echo $(DLLPRE)ucbhelper$(UCBHELPER_MAJOR)$(COMID)$(DLLPOST) >> $@
     @-echo $(DLLPRE)comphelp$(COMPHLP_MAJOR)$(COMID)$(DLLPOST)    >> $@
     @-echo $(DLLPRE)tl$(DFTDLLPOST)    >> $@
@@ -136,4 +164,5 @@ $(MISC)$/$(TARGET)-common : makefile.mk
     @-echo $(DLLPRE)vcl$(DFTDLLPOST)   >> $@
     @-echo $(DLLPRE)tk$(DFTDLLPOST)    >> $@
     @-echo $(DLLPRE)svt$(DFTDLLPOST)   >> $@
-    @-echo soffice.bin                 >> $@
+    @-echo $(DLLPRE)sfx$(DFTDLLPOST)   >> $@
+    @-echo $(DLLPRE)sofficeapp$(DLLPOST) >> $@
-- 
cgit