Index: desktop/source/pagein/makefile.mk
===================================================================
RCS file: /cvs/framework/desktop/source/pagein/makefile.mk,v
retrieving revision 1.9
diff -u -p -u -r1.9 makefile.mk
--- desktop/source/pagein/makefile.mk	5 Oct 2006 10:47:06 -0000	1.9
+++ desktop/source/pagein/makefile.mk	31 Jan 2008 15:22:20 -0000
@@ -73,8 +73,9 @@ ALL: \
     ALLTAR
 
 .INCLUDE :  target.mk
+.INCLUDE .IGNORE : icuversion.mk
 
-ICUDLLPOST=$(DLLPOST).26
+ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
 UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
 UNODLLPOST=.uno$(DLLPOST)
 UPDDLLPOST=$(UPD)$(DLLPOSTFIX)$(DLLPOST)
@@ -99,7 +100,6 @@ $(MISC)$/$(TARGET)-writer : makefile.mk
 	@-echo $(DLLPRE)sw$(UPDDLLPOST)  >  $@
 	@-echo $(DLLPRE)svx$(UPDDLLPOST) >> $@
 
-# sorted in reverse load order (ld.so.1)
 $(MISC)$/$(TARGET)-common : makefile.mk
 	@echo Making: $@
 	@-echo $(DLLPRE)icui18n$(ICUDLLPOST)  >  $@
@@ -138,5 +138,39 @@ $(MISC)$/$(TARGET)-common : makefile.mk
 	@-echo $(DLLPRE)svl$(UPDDLLPOST)   >> $@
 	@-echo $(DLLPRE)vcl$(UPDDLLPOST)   >> $@
 	@-echo $(DLLPRE)tk$(UPDDLLPOST)    >> $@
-	@-echo $(DLLPRE)svt$(UPDDLLPOST)   >> $@
+	@-echo types.rdb                   >> $@
+	@-echo services.rdb                >> $@
 	@-echo soffice.bin                 >> $@
+# urgh ...
+	@-echo oovbaapi.rdb                                         >> $@
+	@-echo deployment$(UPD)$(DLLPOSTFIX)$(UNODLLPOST)           >> $@
+	@-echo $(DLLPRE)deploymentmisc$(UPD)$(DLLPOSTFIX)$(DLLPOST) >> $@
+# omitted pieces (from writer startup ...) hopefully common
+	@-echo $(DLLPRE)ucb1$(DLLPOST)               >> $@
+	@-echo $(DLLPRE)xstor$(DLLPOST)              >> $@
+	@-echo $(DLLPRE)package2$(DLLPOST)           >> $@
+	@-echo $(DLLPRE)filterconfig1$(DLLPOST)      >> $@
+	@-echo $(DLLPRE)uui$(UPDDLLPOST)             >> $@
+	@-echo $(DLLPRE)lng$(UPDDLLPOST)             >> $@
+	@-echo $(DLLPRE)svt$(UPDDLLPOST)             >> $@
+	@-echo $(DLLPRE)spl$(UPDDLLPOST)             >> $@
+	@-echo $(DLLPRE)basegfx$(UPDDLLPOST)         >> $@
+	@-echo $(DLLPRE)avmedia$(UPDDLLPOST)         >> $@
+	@-echo $(DLLPRE)dtransX11$(UPDDLLPOST)       >> $@
+	@-echo $(DLLPRE)helplinker$(UPDDLLPOST)      >> $@
+	@-echo $(DLLPRE)vclplug_gen$(UPDDLLPOST)     >> $@
+	@-echo $(DLLPRE)icule$(ICUDLLPOST)           >> $@
+	@-echo $(DLLPRE)icudata$(ICUDLLPOST)         >> $@
+	@-echo sax$(UNODLLPOST)                      >> $@
+	@-echo gconfbe1$(UNODLLPOST)                 >> $@
+	@-echo fsstorage$(UNODLLPOST)                >> $@
+	@-echo desktopbe$(UNODLLPOST)                >> $@
+	@-echo localebe1$(UNODLLPOST)                >> $@
+	@-echo ucpexpand1$(UNODLLPOST)               >> $@
+# uno bits
+	@-echo $(DLLPRE)reg$(DLLPOST)                >> $@
+	@-echo $(DLLPRE)store$(DLLPOST)              >> $@
+# stoc bits
+	@-echo bootstrap$(UNODLLPOST)                >> $@
+	@-echo reflection$(UNODLLPOST)               >> $@
+	@-echo stocservices$(UNODLLPOST)             >> $@