mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finally, gut the vos module out of the build

Browse Source
This commit is contained in:
Norbert Thiebaud
2010-10-21 16:27:55 -05:00
parent 4bc5acd6d9
commit 534b6430e8
6 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scp2/source/ooo/file_library_ooo.scp
View File

@@ -1567,17 +1567,6 @@ File gid_File_Lib_Vcl
RegistryID = gid_Starregistry_Services_Rdb;
End
File gid_File_Lib_Vos
TXT_FILE_BODY;
#ifdef UNX
Name = STRING(CONCAT3(libvos3,COMID,UNXSUFFIX));
#else
Name = STRING(CONCAT3(vos3,COMID,.dll));
#endif
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
// STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp)
STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr)

1
scp2/source/ooo/module_hidden_ooo.scp
View File

@@ -330,7 +330,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
gid_File_Lib_Unoxml,
gid_File_Lib_Vos,
gid_File_Lib_Localebe,
gid_File_Lib_Migrationoo2,
gid_File_Lib_Syssh,

1
soldep/bootstrp/makefile.mk
View File

@@ -63,7 +63,6 @@ SHL1DEPN =$(SHL1LIBS)
SHL1STDLIBS=\
$(TOOLSLIB) \
$(BTSTRPLIB) \
$(VOSLIB) \
$(SALLIB)
DEF1NAME =$(SHL1TARGET)

2
soldep/source/makefile.mk
View File

@@ -70,7 +70,6 @@ SHL1STDLIBS = $(SVTOOLLIB) \
$(SOTLIB) \
$(BTSTRPLIB) \
$(TOOLSLIB) \
$(VOSLIB) \
$(SALLIB) \
$(CPPULIB) \
$(PERL_LIB)
@@ -111,7 +110,6 @@ APP1STDLIBS= \
$(SOTLIB) \
$(BTSTRPLIB) \
$(TOOLSLIB) \
$(VOSLIB) \
$(SALLIB) \
$(CPPULIB) \
$(PERL_LIB)

4
solenv/inc/libs.mk
View File

@@ -95,7 +95,6 @@ REGLIB=-lreg$(UDK_MAJOR)
REGLIB=-lreg
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.INCLUDE .IGNORE : vos/version.mk
VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
XMLOFFLIB=-lxo$(DLLPOSTFIX)
XMLOFFLLIB=-lxol
.IF "$(GUI)$(COM)"=="WNTGCC"
@@ -324,7 +323,7 @@ BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX)
# Libraries
USED_OSL_LIBS =
USED_VOS_LIBS = $(OSLLIB)
USED_UNO_LIBS = $(VOSLIB) $(OSLLIB)
USED_UNO_LIBS = $(OSLLIB)
USED_TOOLS_LIBS =
USED_SOT_LIBS = $(TOOLSLIB)
USED_VCL_LIBS = $(SOTLIB) $(TOOLSLIB) $(USED_UNO_LIBS)
@@ -394,7 +393,6 @@ TOOLSLIB=itools.lib
TOOLSLIBST=atools.lib
BPICONVLIB=bpiconv.lib
SALLIB=isal.lib
VOSLIB=ivos.lib
UNOTOOLSLIB=iutl.lib
RMCXTLIB=irmcxt.lib
XMLOFFLIB=ixo.lib

2
splitbuild/common.lst
View File

@@ -1 +1 @@
basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards
basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml xmlhelp xmloff xmlscript wizards