diff options
46 files changed, 32 insertions, 83 deletions
diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk index b0d0a6816c..bd167e8744 100644 --- a/avmedia/util/makefile.mk +++ b/avmedia/util/makefile.mk @@ -38,7 +38,7 @@ GEN_HID_OTHER=TRUE # --- Resources --------------------------------- RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res +RESLIB1IMAGES=$(PRJ)$/res RESLIB1SRSFILES= \ $(SRS)$/viewer.srs \ $(SRS)$/framework.srs @@ -48,13 +48,13 @@ RESLIB1SRSFILES= \ LIB1TARGET=$(SLB)$/$(TARGET).lib LIB1FILES=\ $(SLB)$/viewer.lib \ - $(SLB)$/framework.lib - + $(SLB)$/framework.lib + # ========================================================================== SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1IMPLIB=i$(TARGET) -SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) $(VOSLIB) +SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1LIBS=$(SLB)$/$(TARGET).lib diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk index 629586f044..7340d08139 100644 --- a/basic/util/makefile.mk +++ b/basic/util/makefile.mk @@ -57,13 +57,11 @@ SHL1STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(VCLLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(COMPHELPERLIB) \ $(UNOTOOLSLIB) \ $(SOTLIB) \ - $(VOSLIB) \ $(XMLSCRIPTLIB) .IF "$(SOLAR_JAVA)" != "TRUE" diff --git a/basic/workben/makefile.mk b/basic/workben/makefile.mk index 6ec2a9971b..42b65cbb04 100644 --- a/basic/workben/makefile.mk +++ b/basic/workben/makefile.mk @@ -51,14 +51,14 @@ APP1STDLIBS= \ $(CPPULIB) \ $(SJLIB) \ $(SOTLIB) \ - $(VOSLIB) + #.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC" #APP1STDLIBS+=$(CPPULIB) #.ENDIF #.IF "$(GUI)"=="UNX" #APP1STDLIBS+= \ -# $(VOSLIB) \ +# \ # $(SALLIB) #.ENDIF diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk index 5ed3341d28..393a797d2c 100644 --- a/connectivity/source/cpool/makefile.mk +++ b/connectivity/source/cpool/makefile.mk @@ -61,7 +61,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(DBTOOLSLIB) \ $(SALLIB) \ $(SALHELPERLIB) diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index aab8fc5454..1fb9a71308 100644 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -57,7 +57,6 @@ SHL1TARGET= $(DBTOOLS_TARGET)$(DLLPOSTFIX) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(JVMACCESSLIB) \ diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk index c4154cbea3..b5d9903f27 100644 --- a/connectivity/source/drivers/adabas/makefile.mk +++ b/connectivity/source/drivers/adabas/makefile.mk @@ -80,7 +80,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(DBTOOLSLIB) \ diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk index 33e4706482..8fdae27db9 100644 --- a/connectivity/source/drivers/ado/makefile.mk +++ b/connectivity/source/drivers/ado/makefile.mk @@ -85,7 +85,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(OLE32LIB) \ $(OLEAUT32LIB) \ diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index 04ea9e364e..c42d52285f 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -66,7 +66,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ $(UNOTOOLSLIB) \ diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index 3d77af5d66..1aac0b0b1e 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -98,7 +98,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ $(UCBHELPERLIB) \ diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk index 81f34fc6cb..363b08e409 100644 --- a/connectivity/source/drivers/evoab/makefile.mk +++ b/connectivity/source/drivers/evoab/makefile.mk @@ -75,7 +75,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk index 837ef49958..126af90763 100644 --- a/connectivity/source/drivers/evoab2/makefile.mk +++ b/connectivity/source/drivers/evoab2/makefile.mk @@ -75,7 +75,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ $(UNOTOOLSLIB) \ diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk index 16e28a3062..41f061de80 100644 --- a/connectivity/source/drivers/file/makefile.mk +++ b/connectivity/source/drivers/file/makefile.mk @@ -75,7 +75,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ $(UCBHELPERLIB) \ diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk index 3d134ec12d..da801c44a8 100644 --- a/connectivity/source/drivers/flat/makefile.mk +++ b/connectivity/source/drivers/flat/makefile.mk @@ -78,7 +78,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SVLLIB) \ $(UNOTOOLSLIB) \ diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk index 84326eb3c0..d676945f17 100644 --- a/connectivity/source/drivers/jdbc/makefile.mk +++ b/connectivity/source/drivers/jdbc/makefile.mk @@ -87,7 +87,6 @@ SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(JVMACCESSLIB) \ diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk index 2e98efe9ea..98bedf66ed 100644 --- a/connectivity/source/drivers/kab/makefile.mk +++ b/connectivity/source/drivers/kab/makefile.mk @@ -111,7 +111,6 @@ SHL2LINKFLAGS+=$(KAB_LIB) SHL2STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(DBTOOLSLIB) \ diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk index 35532b15ec..89b29916a8 100755 --- a/connectivity/source/drivers/macab/makefile.mk +++ b/connectivity/source/drivers/macab/makefile.mk @@ -101,7 +101,6 @@ SHL2OBJS=$(SLO2FILES) SHL2STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ $(COMPHELPERLIB) \ diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index bb3878d352..0a06f00134 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -82,7 +82,7 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs SLOFILES=\ $(SLO)$/MDriver.obj \ $(SLO)$/MServices.obj - + # --- MOZAB BASE Library ----------------------------------- SHL1VERSIONMAP=$(SOLARENV)/src/component.map @@ -152,7 +152,6 @@ SHL2OBJS=$(SLO2FILES) SHL2STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(DBTOOLSLIB) \ diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk index 0f83addab9..85e96ea857 100644 --- a/connectivity/source/drivers/odbcbase/makefile.mk +++ b/connectivity/source/drivers/odbcbase/makefile.mk @@ -66,7 +66,6 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk index c1caaecf67..68fc0f3035 100644 --- a/connectivity/workben/iniParser/makefile.mk +++ b/connectivity/workben/iniParser/makefile.mk @@ -42,13 +42,12 @@ OBJFILES= $(OBJ)$/main.obj APPSTDLIBS=$(SALLIB) \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(UCBHELPERLIB) \ $(DBTOOLSLIB) \ $(COMPHELPERLIB) - + # ... cfgapi .............................. @@ -57,6 +56,6 @@ APP1OBJS= $(OBJFILES) APP1STDLIBS = $(APPSTDLIBS) # --- Targets ------------------------------------------------------ - + .INCLUDE : target.mk diff --git a/connectivity/workben/little/makefile.mk b/connectivity/workben/little/makefile.mk index 5d3d6516f3..220fa91b75 100644 --- a/connectivity/workben/little/makefile.mk +++ b/connectivity/workben/little/makefile.mk @@ -43,11 +43,10 @@ OBJFILES= $(OBJ)$/main.obj APP1TARGET= $(TARGET) APP1OBJS= $(OBJFILES) APPSTDLIBS=$(SALLIB) \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SLB)$/sql.lib - + # ... cfgapi .............................. APP1STDLIBS = $(APPSTDLIBS) diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk index 387d2e4a20..f3135738b3 100644 --- a/connectivity/workben/testmoz/makefile.mk +++ b/connectivity/workben/testmoz/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ OBJFILES= $(OBJ)$/main.obj APPSTDLIBS=$(SALLIB) \ - $(VOSLIB) \ + \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(UCBHELPERLIB) \ $(DBTOOLSLIB) \ $(COMPHELPERLIB) - + # ... cfgapi .............................. @@ -57,14 +57,14 @@ APP1OBJS= $(OBJFILES) APP1STDLIBS = $(APPSTDLIBS) - + APP2TARGET = mozThread APP2OBJS = $(OBJ)$/initUNO.obj \ $(OBJ)$/mozthread.obj - + APP2STDLIBS = $(APPSTDLIBS) # --- Targets ------------------------------------------------------ - + .INCLUDE : target.mk diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index e69b387891..e7c30a2ca7 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -95,7 +95,7 @@ SHL1STDLIBS = \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ $(VCLLIB) \ - $(VOSLIB) + SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index b28b3438f4..01f1287bc7 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -65,7 +65,6 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SFXLIB) diff --git a/desktop/unx/splash/makefile.mk b/desktop/unx/splash/makefile.mk index 7466a6d143..d182173de1 100644 --- a/desktop/unx/splash/makefile.mk +++ b/desktop/unx/splash/makefile.mk @@ -60,7 +60,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) SHL1STDLIBS= \ - $(VOSLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 480fee550c..3d4950cb40 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -57,18 +57,6 @@ RCFILES=ooverinfo2.rc LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//) .ENDIF # MACOSX -#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD" -## #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, -## winXX is handled like solaris for now -#APP1_STDPRE= -#APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \ -# $(VOSLIB) $(SALLIB) -#.ELSE -#APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \ -# $(CPPUHELPERLIB) -#APP1_STDPOST= -#.ENDIF - RESLIB1NAME= dkt RESLIB1IMAGES= $(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/desktop.srs @@ -218,7 +206,7 @@ ALLTAR : $(BIN)$/soffice_oo$(EXECPOST) .IF "$(LINK_SO)"=="TRUE" $(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN) $(COPY) $< $@ - + ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST) .ENDIF # "$(LINK_SO)"=="TRUE" diff --git a/editeng/util/makefile.mk b/editeng/util/makefile.mk index b1e5675240..e27dac147c 100644 --- a/editeng/util/makefile.mk +++ b/editeng/util/makefile.mk @@ -56,7 +56,7 @@ SHL1LIBS= \ $(SLB)$/accessibility.lib \ $(SLB)$/editeng.lib \ $(SLB)$/outliner.lib \ - $(SLB)$/xml.lib + $(SLB)$/xml.lib SHL1STDLIBS= \ $(XMLOFFLIB) \ @@ -75,7 +75,6 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(ICUUCLIB) diff --git a/embeddedobj/prj/build.lst b/embeddedobj/prj/build.lst index a61305e192..e6b48d8e00 100644 --- a/embeddedobj/prj/build.lst +++ b/embeddedobj/prj/build.lst @@ -1,4 +1,4 @@ -eo embeddedobj : offuh sal cppu cppuhelper comphelper tools unotools vos NULL +eo embeddedobj : offuh sal cppu cppuhelper comphelper tools unotools NULL eo embeddedobj usr1 - all eo_mkout NULL eo embeddedobj\inc nmake - all eo_inc NULL eo embeddedobj\source\commonembedding nmake - all eo_commonembed eo_inc NULL diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk index 07b08bce69..e8d4a42d19 100644 --- a/embeddedobj/source/msole/makefile.mk +++ b/embeddedobj/source/msole/makefile.mk @@ -89,12 +89,11 @@ SHL1OBJS= $(SLOFILES) SHL1STDLIBS=\ $(UNOTOOLSLIB)\ $(SALLIB)\ - $(VOSLIB)\ $(CPPULIB)\ $(CPPUHELPERLIB)\ $(COMPHELPERLIB)\ $(TOOLSLIB) - + .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/eventattacher/prj/build.lst b/eventattacher/prj/build.lst index aa931705fd..400b5a8f52 100644 --- a/eventattacher/prj/build.lst +++ b/eventattacher/prj/build.lst @@ -1,4 +1,4 @@ -ea eventattacher : offapi cppuhelper vos NULL +ea eventattacher : offapi cppuhelper NULL ea eventattacher usr1 - all ea_mkout NULL ea eventattacher\prj get - all ea_prj NULL ea eventattacher\source nmake - all ea_source NULL diff --git a/fpicker/test/makefile.mk b/fpicker/test/makefile.mk index 66d9c348f3..9cdf1adb15 100644 --- a/fpicker/test/makefile.mk +++ b/fpicker/test/makefile.mk @@ -58,7 +58,6 @@ APP1STDLIBS= $(CPPULIB) \ $(VCLLIB) \ $(TOOLSLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(SVLIB) -l$(LB)/fps_office.uno.lib diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk index 6764af8dd0..1059cbca44 100644 --- a/framework/test/makefile.mk +++ b/framework/test/makefile.mk @@ -49,7 +49,7 @@ USE_DEFFILE= TRUE #APP1STDLIBS= $(CPPULIB) \ # $(CPPUHELPERLIB) \ # $(SALLIB) \ -# $(VOSLIB) \ +# \ # $(TOOLSLIB) \ # $(SVTOOLLIB) \ # $(TKLIB) \ @@ -77,7 +77,6 @@ DEPOBJFILES+= $(APP2OBJS) APP2STDLIBS= $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(VCLLIB) APP2DEPN= $(SLO)$/fairrwlock.obj \ diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk index 833c328dc8..467f628890 100644 --- a/framework/test/threadtest/makefile.mk +++ b/framework/test/threadtest/makefile.mk @@ -40,20 +40,19 @@ USE_DEFFILE= TRUE APP1TARGET= threadtest -APP1OBJS= $(SLO)$/threadtest.obj \ +APP1OBJS= $(SLO)$/threadtest.obj \ $(SLO)$/lockhelper.obj DEPOBJFILES=$(APP1OBJS) # [ed] 6/16/02 Add the transaction manager library on OS X -APP1STDLIBS= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(VOSLIB) \ +APP1STDLIBS= $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(SALLIB) \ $(VCLLIB) -APP1DEPN= $(INC)$/threadhelp$/threadhelpbase.hxx \ +APP1DEPN= $(INC)$/threadhelp$/threadhelpbase.hxx \ $(INC)$/threadhelp$/transactionbase.hxx \ $(INC)$/threadhelp$/transactionmanager.hxx \ $(INC)$/threadhelp$/transactionguard.hxx \ diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk index 83782fdc4d..730febefdd 100644 --- a/framework/test/typecfg/makefile.mk +++ b/framework/test/typecfg/makefile.mk @@ -53,7 +53,6 @@ DEPOBJFILES=$(APP2OBJS) APP2STDLIBS= $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk index efa5fc3fd8..c5f77714f2 100644 --- a/framework/util/guiapps/makefile.mk +++ b/framework/util/guiapps/makefile.mk @@ -52,7 +52,6 @@ DEPOBJFILES=$(APP1OBJS) APP1STDLIBS= $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 85dff0aab6..78c680f5ad 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -116,7 +116,6 @@ SHL1STDLIBS= \ $(SVTOOLLIB) \ $(SVLLIB) \ $(I18NISOLANGLIB) \ - $(VOSLIB) \ $(VCLLIB) \ $(TKLIB) \ $(CPPULIB) \ @@ -156,7 +155,6 @@ SHL2STDLIBS= \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) SHL2DEF= $(MISC)$/$(SHL2TARGET).def diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst index 57c332f6f3..8b17240c31 100644 --- a/linguistic/prj/build.lst +++ b/linguistic/prj/build.lst @@ -1,4 +1,4 @@ -lg linguistic : svl xmloff ucbhelper vos comphelper ICU:icu NULL +lg linguistic : svl xmloff ucbhelper comphelper ICU:icu NULL lg linguistic usr1 - all lg_mkout NULL lg linguistic\prj get - all lg_prj NULL lg linguistic\inc nmake - all lg_inc NULL diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index 3f68afb305..47c8ef334b 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -65,7 +65,6 @@ SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ $(SVLLIB) \ diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk index 26cbb7ec8d..6c04929d7b 100644 --- a/linguistic/workben/makefile.mk +++ b/linguistic/workben/makefile.mk @@ -77,7 +77,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index 2d93e7692d..139cb7657c 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -91,7 +91,6 @@ SHL1STDLIBS+=\ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(LIBXML2LIB) \ diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 06e3132f4e..2e756b5aa3 100644 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk @@ -96,7 +96,6 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(ICUUCLIB) @@ -152,7 +151,6 @@ SHL2STDLIBS= \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(VOSLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ $(ICUUCLIB) diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk index 4aa0a098f0..4481316dd7 100644 --- a/svx/workben/makefile.mk +++ b/svx/workben/makefile.mk @@ -47,7 +47,6 @@ APP1TARGET= $(TARGET) APP1OBJS= $(OBJFILES) APP1LIBS= $(LB)$/svx.lib APP1STDLIBS=$(TOOLSLIB) \ - $(VOSLIB) \ $(SO2LIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk index ee4d384399..2ce9d573de 100644 --- a/svx/workben/msview/makefile.mk +++ b/svx/workben/msview/makefile.mk @@ -58,7 +58,6 @@ APP1STDLIBS= $(CPPULIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(SALLIB) \ - $(VOSLIB) \ $(SOTLIB) \ $(VCLLIB) \ $(SVXLIB) \ diff --git a/ucb/workben/ucb/makefile.mk b/ucb/workben/ucb/makefile.mk index 9a9992a3a7..54f100b819 100644 --- a/ucb/workben/ucb/makefile.mk +++ b/ucb/workben/ucb/makefile.mk @@ -69,7 +69,6 @@ COMPHELPERLIB=icomphelp2.lib APP1STDLIBS=\ $(SALLIB) \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(COMPHELPERLIB) \ diff --git a/xmlhelp/source/cxxhelp/test/makefile.mk b/xmlhelp/source/cxxhelp/test/makefile.mk index c255f3fea8..4521f909e4 100644 --- a/xmlhelp/source/cxxhelp/test/makefile.mk +++ b/xmlhelp/source/cxxhelp/test/makefile.mk @@ -53,8 +53,8 @@ APP1OBJS=\ $(OBJ)$/searchdemo.obj APP1STDLIBS=\ - $(SALLIB) \ - $(VOSLIB) + $(SALLIB) + APP1LIBS=\ $(SLB)/jaqe.lib \ diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst index 7b68ed08ff..71a7ca4394 100644 --- a/xmloff/prj/build.lst +++ b/xmloff/prj/build.lst @@ -1,4 +1,4 @@ -xo xmloff : offapi svl vos NULL +xo xmloff : offapi svl NULL xo xmloff usr1 - all xo_mkout NULL xo xmloff\prj get - all xo_prj NULL xo xmloff\inc nmake - all xo_inc NULL diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index d01fbd829a..54274673a8 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -60,7 +60,6 @@ SHL1USE_EXPORTS=name SHL1STDLIBS= \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ - $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB)\ $(COMPHELPERLIB)\ |