[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/AutoInstall.mk scp2/InstallModule_calc.mk scp2/source
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Tue Jun 11 07:49:44 PDT 2013
Repository.mk | 830 ++++++++++++++++-------------------
scp2/AutoInstall.mk | 1
scp2/InstallModule_calc.mk | 2
scp2/source/calc/file_calc.scp | 18
scp2/source/calc/module_calc.scp | 11
scp2/source/ooo/file_library_ooo.scp | 2
6 files changed, 403 insertions(+), 461 deletions(-)
New commits:
commit cb548bc7a1c863d1716ce0f609a64f45a8d73328
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Mon Jun 10 19:20:14 2013 -0300
fdo#60924 autoinstall - gbuild/scp2: add calc module
Change-Id: I89e87f2e107bdb31f19262c83f8e20be9642a4eb
diff --git a/Repository.mk b/Repository.mk
index 1e7bec1..c37f6d6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -157,6 +157,19 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
dbu \
))
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+ analysis \
+ calc \
+ date \
+ pricing \
+ sc \
+ scd \
+ scfilt \
+ scui \
+ solver \
+ $(if $(DISABLE_SCRIPTING),,vbaobj) \
+))
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
svgfilter \
flash \
@@ -341,35 +354,26 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
adabasui \
ado \
agg \
- analysis \
$(if $(filter $(OS),ANDROID),, \
basebmp \
) \
communi \
- date \
oox \
ooxml \
sdbc \
AppleRemote \
avmediaQuickTime \
- calc \
filtertracer \
log \
MacOSXSpell \
mork \
mozab2 \
mozabdrv \
- pricing \
protocolhandler \
rpt \
rptui \
rptxml \
- sc \
- scd \
- scfilt \
- scui \
simplecm \
- solver \
spa \
spell \
sts \
@@ -584,7 +588,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
ucptdoc1 \
updatefeed \
vbaevents \
- vbaobj \
vbaswobj \
$(if $(filter $(OS),MACOSX), \
fps_aqua \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index a6dad3c..3dfb56a2 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_AutoInstall_AutoInstall))
$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
index dba5960..acb1009 100644
--- a/scp2/InstallModule_calc.mk
+++ b/scp2/InstallModule_calc.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/calc))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc))
+
$(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
ENABLE_LPSOLVE \
SYSTEM_LPSOLVE \
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 115681b..171459e 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -18,12 +18,6 @@
#include "macros.inc"
-STD_LIB_FILE( gid_File_Lib_Solver, solver)
-
-STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
-
-STD_LIB_FILE( gid_File_Lib_Pricing, pricing)
-
File gid_File_Share_Registry_Calc_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
@@ -31,18 +25,6 @@ File gid_File_Share_Registry_Calc_Xcd
Name = "calc.xcd";
End
-STD_LIB_FILE( gid_File_Lib_Calc, calc)
-
-STD_LIB_FILE( gid_File_Lib_Date, date)
-
-STD_LIB_FILE( gid_File_Lib_Sc, sc)
-
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
-
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
-
-STD_LIB_FILE( gid_File_Lib_Scd, scd)
-
STD_RES_FILE( gid_File_Res_Analysis, analysis)
STD_RES_FILE( gid_File_Res_Date, date)
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 46b4271..35aafdf 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -18,6 +18,8 @@
#include "macros.inc"
+#include "AutoInstall/calc"
+
Module gid_Module_Prg_Calc
MOD_NAME_DESC ( MODULE_PRG_CALC );
ParentID = gid_Module_Prg;
@@ -33,10 +35,9 @@ Module gid_Module_Prg_Calc_Bin
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
- gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
- gid_File_Lib_Vbaobj,
- gid_File_Tmp_Userinstall_Calc_Inf);
+ Files = (auto_calc_ALL
+ gid_File_Share_Registry_Calc_Xcd,
+ gid_File_Lib_Lpsolve);
End
Module gid_Module_Prg_Calc_Addins
@@ -45,7 +46,7 @@ Module gid_Module_Prg_Calc_Addins
ParentID = gid_Module_Prg_Calc_Bin;
Sortkey = "700";
Default = YES;
- Files = (gid_File_Lib_Date,gid_File_Zip_Addin,gid_File_Lib_Rot,gid_File_Lib_Dfa,gid_File_Lib_Analysis,gid_File_Lib_Pricing);
+ Files = (gid_File_Zip_Addin,gid_File_Lib_Rot);
End
Module gid_Module_Brand_Prg_Calc
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 03243b8..42518c6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -235,8 +235,6 @@ STD_LIB_FILE( gid_File_Lib_Dlgprov, dlgprov )
STD_LIB_FILE( gid_File_Lib_Stringresource, stringresource )
-STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj)
-
STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj)
STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms)
commit 6141dbbac58a0c8632379fddec92bc72fcf3b78f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Jun 11 00:59:27 2013 +0200
Repository.mk: make this file a bit more readable & consistent
Change-Id: Ibfca283cdf89fdb4eded06dde2b2f30b05df6882
diff --git a/Repository.mk b/Repository.mk
index 359f841..1e7bec1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -18,139 +18,108 @@
#
$(eval $(call gb_Helper_register_executables,NONE, \
- HelpIndexer \
- HelpLinker \
- bestreversemap \
- cfgex \
+ HelpIndexer \
+ HelpLinker \
+ bestreversemap \
+ cfgex \
concat-deps \
- cpp \
- cppunit/cppunittester \
- $(call gb_Helper_optional,CRASHREP,crashrep) \
- gencoll_rule \
- genconv_dict \
- gendict \
- genindex_data \
- helpex \
- idxdict \
+ cpp \
+ cppunit/cppunittester \
+ $(call gb_Helper_optional,CRASHREP,crashrep) \
+ gencoll_rule \
+ genconv_dict \
+ gendict \
+ genindex_data \
+ helpex \
+ idxdict \
langsupport \
+ $(if $(ENABLE_TELEPATHY),liboapprover) \
+ $(if $(filter IOS,$(OS)),LibreOffice) \
libtest \
- lngconvex \
- localize \
- makedepend \
- mork_helper \
- osl_process_child \
- pdf2xml \
- pdfunzip \
- propex \
- reg2unoidl \
- regsvrex \
- rsc \
- saxparser \
- sp2bv \
- svg2odf \
- svidl \
- stringex \
- transex3 \
- treex \
- $(if $(filter UCPP,$(BUILD_TYPE)),\
- ucpp \
- ) \
- uiex \
- ulfex \
- $(call gb_Helper_optional,ODK,unoapploader) \
- xpdfimport \
- xrmex \
-))
-
-ifneq ($(OS),WNT)
-$(eval $(call gb_Helper_register_executables,NONE,\
- liboapprover \
+ lngconvex \
+ localize \
+ makedepend \
+ mork_helper \
+ osl_process_child \
+ pdf2xml \
+ pdfunzip \
+ propex \
+ reg2unoidl \
+ regsvrex \
+ rsc \
+ saxparser \
+ sp2bv \
+ svg2odf \
+ svidl \
+ stringex \
+ transex3 \
+ treex \
+ $(if $(filter UCPP,$(BUILD_TYPE)),ucpp) \
+ uiex \
+ ulfex \
+ $(call gb_Helper_optional,ODK,unoapploader) \
+ xpdfimport \
+ xrmex \
))
-endif
-
-$(eval $(call gb_Helper_register_executables,SDK, \
- idlc \
-))
-
-ifneq ($(OS),IOS)
$(eval $(call gb_Helper_register_executables,SDK, \
- climaker \
- cppumaker \
- javamaker \
- regcompare \
- uno-skeletonmaker \
+ idlc \
+ $(if $(filter-out IOS,$(OS)), \
+ climaker \
+ cppumaker \
+ javamaker \
+ regcompare \
+ uno-skeletonmaker \
+ ) \
))
-endif
-
$(eval $(call gb_Helper_register_executables,OOO, \
- gnome-open-url.bin \
- spadmin.bin \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),gengal.bin) \
+ gnome-open-url.bin \
+ $(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \
+ $(if $(filter MACOSX,$(OS)),officeloader) \
+ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
+ $(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
+ $(if $(filter-out WNT,$(OS)),soffice.bin) \
+ spadmin.bin \
$(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \
tdefilepicker \
) \
- uri-encode \
+ uri-encode \
$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
kdefilepicker \
) \
ui-previewer \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg.bin) \
+ $(if $(filter WNT,$(OS)), \
+ crashrep_com \
+ gengal \
+ gcc-wrapper \
+ g++-wrapper \
+ guiloader \
+ guistdio \
+ odbcconfig \
+ officeloader \
+ pyuno/python \
+ quickstart \
+ sbase \
+ scalc \
+ sdraw \
+ senddoc \
+ simpress \
+ soffice \
+ soffice_bin \
+ smath \
+ sweb \
+ swriter \
+ unoinfo \
+ unopkg \
+ unopkg_bin \
+ unopkg_com \
+ unopkgio \
+ ) \
))
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Helper_register_executables,OOO,\
- crashrep_com \
- gengal \
- gcc-wrapper \
- g++-wrapper \
- guiloader \
- guistdio \
- odbcconfig \
- officeloader \
- pyuno/python \
- quickstart \
- sbase \
- scalc \
- sdraw \
- senddoc \
- simpress \
- soffice \
- soffice_bin \
- smath \
- sweb \
- swriter \
- unoinfo \
- unopkg \
- unopkg_bin \
- unopkg_com \
- unopkgio \
-))
-
-else
-
-$(eval $(call gb_Helper_register_executables,OOO,\
- soffice.bin \
- unopkg.bin \
- gengal.bin \
-))
-
-ifeq ($(OS),MACOSX)
-
-$(eval $(call gb_Helper_register_executables,OOO,\
- officeloader \
-))
-
-else
-
-$(eval $(call gb_Helper_register_executables,OOO,\
- oosplash \
-))
-
-endif
-
-endif
-
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(if $(filter-out IOS,$(OS)), \
regmerge \
@@ -163,210 +132,196 @@ $(eval $(call gb_Helper_register_executables,UREBIN,\
))
ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
- pluginapp.bin \
-))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- pl \
+ pl \
))
endif
ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
-$(eval $(call gb_Helper_register_executables,OOO,\
- nsplugin \
-))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- npsoplugin \
-))
-endif
-
-ifeq ($(OS),IOS)
-
-$(eval $(call gb_Helper_register_executables,NONE,\
- LibreOffice \
+ npsoplugin \
))
-
endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
- OOoSpotlightImporter \
+ OOoSpotlightImporter \
))
endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
- abp \
- dbp \
- dbu \
+ abp \
+ dbp \
+ dbu \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
- svgfilter \
- flash \
- wpftdraw \
- graphicfilter \
+ svgfilter \
+ flash \
+ wpftdraw \
+ graphicfilter \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,tde, \
- $(if $(ENABLE_TDE),tdebe1) \
+ $(if $(ENABLE_TDE),tdebe1) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
- animcore \
- placeware \
- PresenterScreen \
+ animcore \
+ placeware \
+ PresenterScreen \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
- updatecheckui \
- updchk \
+ updatecheckui \
+ updchk \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
- $(if $(ENABLE_EVOAB2),evoab) \
- $(if $(ENABLE_GTK),vclplug_gtk) \
- $(if $(ENABLE_GTK3),vclplug_gtk3) \
- $(if $(ENABLE_GCONF),gconfbe1) \
- $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
- $(if $(ENABLE_GIO),losessioninstall) \
- $(if $(ENABLE_GIO),ucpgio1) \
- $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
+ $(if $(ENABLE_EVOAB2),evoab) \
+ $(if $(ENABLE_GTK),vclplug_gtk) \
+ $(if $(ENABLE_GTK3),vclplug_gtk3) \
+ $(if $(ENABLE_GCONF),gconfbe1) \
+ $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
+ $(if $(ENABLE_GIO),losessioninstall) \
+ $(if $(ENABLE_GIO),ucpgio1) \
+ $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
- $(if $(ENABLE_KDE),kdebe1) \
- $(if $(ENABLE_KDE4),kde4be1) \
+ $(if $(ENABLE_KDE),kdebe1) \
+ $(if $(ENABLE_KDE4),kde4be1) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
- sm \
- smd \
+ sm \
+ smd \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
avmedia \
$(if $(DISABLE_SCRIPTING),,basctl) \
- basegfx \
- bib \
- $(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
- canvasfactory \
- canvastools \
- chartcore \
- chartcontroller \
- cppcanvas \
- configmgr \
- ctl \
- cui \
- dba \
- dbase \
- dbmm \
- $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
- dbaxml \
- deploymentmisc \
- $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
- $(if $(filter unx,$(GUIBASE)),desktop_detector) \
- $(if $(ENABLE_DIRECTX),directx9canvas) \
- drawinglayer \
- editeng \
- egi \
- eme \
- $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
- epb \
- epg \
- epp \
- eps \
- ept \
- era \
- eti \
- evtatt \
- exp \
- flat \
+ basegfx \
+ bib \
+ $(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
+ canvasfactory \
+ canvastools \
+ chartcore \
+ chartcontroller \
+ cppcanvas \
+ configmgr \
+ ctl \
+ cui \
+ dba \
+ dbase \
+ dbmm \
+ $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
+ dbaxml \
+ deploymentmisc \
+ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
+ $(if $(filter unx,$(GUIBASE)),desktop_detector) \
+ $(if $(ENABLE_DIRECTX),directx9canvas) \
+ drawinglayer \
+ editeng \
+ egi \
+ eme \
+ $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
+ epb \
+ epg \
+ epp \
+ eps \
+ ept \
+ era \
+ eti \
+ evtatt \
+ exp \
+ flat \
file \
filterconfig \
- for \
- forui \
- frm \
- fsstorage \
- fwe \
+ for \
+ forui \
+ frm \
+ fsstorage \
+ fwe \
fwi \
- fwk \
- fwl \
+ fwk \
+ fwl \
fwm \
- $(if $(ENABLE_DIRECTX),gdipluscanvas) \
- guesslang \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
- i18npool \
- hyphen \
- icd \
- icg \
- idx \
- ime \
- ipb \
- ipd \
- ips \
- ipt \
- ipx \
- ira \
- itg \
- iti \
- $(if $(SOLAR_JAVA),jdbc) \
- $(if $(ENABLE_KAB),kab1) \
- $(if $(ENABLE_KAB),kabdrv1) \
- localebe1 \
- lng \
- lnth \
- $(if $(MERGELIBS),merged) \
- msfilter \
- mtfrenderer \
- mysql \
- odbc \
- odbcbase \
- odfflatxml \
- offacc \
- pcr \
- pdffilter \
- res \
- sax \
- sb \
- sdbt \
- scn \
- sd \
- sdd \
- sdfilt \
- sdui \
- sfx \
- simplecanvas \
- sot \
- $(if $(ENABLE_HEADLESS),,spl) \
- svgio \
- svl \
- svt \
- svx \
- svxcore \
- sw \
- $(if $(ENABLE_TDEAB),tdeab1) \
- $(if $(ENABLE_TDEAB),tdeabdrv1) \
- textconversiondlgs \
- tk \
- tl \
+ $(if $(ENABLE_DIRECTX),gdipluscanvas) \
+ guesslang \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
+ i18npool \
+ hyphen \
+ icd \
+ icg \
+ idx \
+ ime \
+ ipb \
+ ipd \
+ ips \
+ ipt \
+ ipx \
+ ira \
+ itg \
+ iti \
+ $(if $(SOLAR_JAVA),jdbc) \
+ $(if $(ENABLE_KAB),kab1) \
+ $(if $(ENABLE_KAB),kabdrv1) \
+ localebe1 \
+ lng \
+ lnth \
+ $(if $(MERGELIBS),merged) \
+ msfilter \
+ mtfrenderer \
+ mysql \
+ odbc \
+ odbcbase \
+ odfflatxml \
+ offacc \
+ pcr \
+ pdffilter \
+ res \
+ sax \
+ sb \
+ sdbt \
+ scn \
+ sd \
+ sdd \
+ sdfilt \
+ sdui \
+ sfx \
+ simplecanvas \
+ sot \
+ $(if $(ENABLE_HEADLESS),,spl) \
+ svgio \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ sw \
+ $(if $(ENABLE_TDEAB),tdeab1) \
+ $(if $(ENABLE_TDEAB),tdeabdrv1) \
+ textconversiondlgs \
+ tk \
+ tl \
$(if $(ENABLE_TELEPATHY),tubes) \
- ucpexpand1 \
- unordf \
- unoxml \
- utl \
- uui \
- vcl \
- vclcanvas \
- $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \
- xmlscript \
- xmlfa \
- xmlfd \
- xo \
- xof \
- xsltdlg \
- xsltfilter \
+ ucpexpand1 \
+ unordf \
+ unoxml \
+ utl \
+ uui \
+ vcl \
+ vclcanvas \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \
+ xmlscript \
+ xmlfa \
+ xmlfd \
+ xo \
+ xof \
+ xsltdlg \
+ xsltfilter \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
@@ -381,49 +336,49 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- acc \
+ acc \
adabas \
adabasui \
ado \
- agg \
- analysis \
- $(if $(filter $(OS),ANDROID),, \
+ agg \
+ analysis \
+ $(if $(filter $(OS),ANDROID),, \
basebmp \
- ) \
- communi \
- date \
- oox \
+ ) \
+ communi \
+ date \
+ oox \
ooxml \
- sdbc \
- AppleRemote \
- avmediaQuickTime \
- calc \
+ sdbc \
+ AppleRemote \
+ avmediaQuickTime \
+ calc \
filtertracer \
- log \
+ log \
MacOSXSpell \
- mork \
- mozab2 \
- mozabdrv \
- pricing \
- protocolhandler \
- rpt \
- rptui \
- rptxml \
- sc \
- scd \
- scfilt \
- scui \
- simplecm \
- solver \
- spa \
- spell \
- sts \
- textfd \
- $(if $(DISABLE_SCRIPTING),,vbahelper) \
- vclplug_tde \
- vclplug_kde \
- vclplug_kde4 \
- vclplug_svp \
+ mork \
+ mozab2 \
+ mozabdrv \
+ pricing \
+ protocolhandler \
+ rpt \
+ rptui \
+ rptxml \
+ sc \
+ scd \
+ scfilt \
+ scui \
+ simplecm \
+ solver \
+ spa \
+ spell \
+ sts \
+ textfd \
+ $(if $(DISABLE_SCRIPTING),,vbahelper) \
+ vclplug_tde \
+ vclplug_kde \
+ vclplug_kde4 \
+ vclplug_svp \
))
ifneq (,$(filter ANDROID IOS,$(OS)))
@@ -437,18 +392,18 @@ endif
ifeq ($(filter MACOSX WNT,$(OS)),)
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- spl_unx \
+ spl_unx \
))
endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
- smoketest \
- subsequenttest \
- test \
- unobootstrapprotector \
- unoexceptionprotector \
- unotest \
+ smoketest \
+ subsequenttest \
+ test \
+ unobootstrapprotector \
+ unoexceptionprotector \
+ unotest \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
@@ -513,159 +468,159 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
xstor \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- avmediagst \
- avmediagst_0_10 \
- avmediawin \
- bluez_bluetooth \
- cached1 \
- collator_data \
- dbpool2 \
- deploymentgui \
- dict_ja \
- dict_zh \
- embobj \
- emboleobj \
- hsqldb \
- index_data \
- java_uno_accessbridge \
- libreoffice \
- localedata_en \
- localedata_es \
- localedata_euro \
- localedata_others \
- macab1 \
- macabdrv1 \
- mozbootstrap \
- officebean \
- pyuno \
- pyuno_wrapper \
- recentfile \
- scriptframe \
- sdbc2 \
- srtrs1 \
- textconv_dict \
- tvhlp1 \
- ucpdav1 \
- ucpftp1 \
- ucpchelp1 \
- ucphier1 \
- ucppkg1 \
- unopkgapp \
- xmlsecurity \
- xsec_fw \
- xsec_xmlsec \
- $(if $(filter $(OS),ANDROID), \
- lo-bootstrap \
- ) \
- $(if $(filter $(OS),WNT), \
- uwinapi \
- ) \
+ avmediagst \
+ avmediagst_0_10 \
+ avmediawin \
+ bluez_bluetooth \
+ cached1 \
+ collator_data \
+ dbpool2 \
+ deploymentgui \
+ dict_ja \
+ dict_zh \
+ embobj \
+ emboleobj \
+ hsqldb \
+ index_data \
+ java_uno_accessbridge \
+ libreoffice \
+ localedata_en \
+ localedata_es \
+ localedata_euro \
+ localedata_others \
+ macab1 \
+ macabdrv1 \
+ mozbootstrap \
+ officebean \
+ pyuno \
+ pyuno_wrapper \
+ recentfile \
+ scriptframe \
+ sdbc2 \
+ srtrs1 \
+ textconv_dict \
+ tvhlp1 \
+ ucpdav1 \
+ ucpftp1 \
+ ucpchelp1 \
+ ucphier1 \
+ ucppkg1 \
+ unopkgapp \
+ xmlsecurity \
+ xsec_fw \
+ xsec_xmlsec \
+ $(if $(filter $(OS),ANDROID), \
+ lo-bootstrap \
+ ) \
+ $(if $(filter $(OS),WNT), \
+ uwinapi \
+ ) \
))
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- dnd \
- dtrans \
- fop \
- fps \
- ftransl \
- inprocserv \
- instooofiltmsi \
- jfregca \
- ooofilt \
- ooofilt_x64 \
- propertyhdl \
- propertyhdl_x64 \
- qslnkmsi \
- reg4allmsdoc \
- regactivex \
+ dnd \
+ dtrans \
+ fop \
+ fps \
+ ftransl \
+ inprocserv \
+ instooofiltmsi \
+ jfregca \
+ ooofilt \
+ ooofilt_x64 \
+ propertyhdl \
+ propertyhdl_x64 \
+ qslnkmsi \
+ reg4allmsdoc \
+ regactivex \
regpatchactivex \
- sdqsmsi \
- sellangmsi \
- shlxthdl \
- shlxthdl_x64 \
- shlxtmsi \
- sn_tools \
- so_activex \
- so_activex_x64 \
- sysdtrans \
+ sdqsmsi \
+ sellangmsi \
+ shlxthdl \
+ shlxthdl_x64 \
+ shlxtmsi \
+ sn_tools \
+ so_activex \
+ so_activex_x64 \
+ sysdtrans \
thidxmsi \
unowinreg \
))
endif
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
- cppuhelper \
- purpenvhelper \
- salhelper \
+ cppuhelper \
+ purpenvhelper \
+ salhelper \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- basprov \
- cmdmail \
- dlgprov \
- expwrap \
- fastsax \
- fpicker \
- fps_office \
- hatchwindowfactory \
- i18nsearch \
- ldapbe2 \
- macbe1 \
- migrationoo2 \
- migrationoo3 \
- msforms \
- OGLTrans \
- passwordcontainer \
- pdfimport \
- postgresql-sdbc \
- postgresql-sdbc-impl \
- pythonloader \
- slideshow \
- stringresource \
- syssh \
- ucpcmis1 \
- ucpext \
- ucptdoc1 \
- updatefeed \
- vbaevents \
- vbaobj \
- vbaswobj \
- $(if $(filter $(OS),MACOSX), \
- fps_aqua \
- ) \
- $(if $(filter $(OS),WNT), \
- oleautobridge \
- smplmail \
- wininetbe1 \
- ) \
+ basprov \
+ cmdmail \
+ dlgprov \
+ expwrap \
+ fastsax \
+ fpicker \
+ fps_office \
+ hatchwindowfactory \
+ i18nsearch \
+ ldapbe2 \
+ macbe1 \
+ migrationoo2 \
+ migrationoo3 \
+ msforms \
+ OGLTrans \
+ passwordcontainer \
+ pdfimport \
+ postgresql-sdbc \
+ postgresql-sdbc-impl \
+ pythonloader \
+ slideshow \
+ stringresource \
+ syssh \
+ ucpcmis1 \
+ ucpext \
+ ucptdoc1 \
+ updatefeed \
+ vbaevents \
+ vbaobj \
+ vbaswobj \
+ $(if $(filter $(OS),MACOSX), \
+ fps_aqua \
+ ) \
+ $(if $(filter $(OS),WNT), \
+ oleautobridge \
+ smplmail \
+ wininetbe1 \
+ ) \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
- testtools_cppobj \
- testtools_bridgetest \
- testtools_constructors \
+ testtools_cppobj \
+ testtools_bridgetest \
+ testtools_constructors \
))
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
- cppu \
- sal \
+ cppu \
+ sal \
))
$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
SunPresentationMinimizer \
- mysqlc \
- passive_native \
+ mysqlc \
+ passive_native \
))
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- xmlsec1 \
- xmlsec1-nss \
+ xmlsec1 \
+ xmlsec1-nss \
))
ifneq ($(CROSS_COMPILING),YES)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- xmlsec1-mscrypto \
+ xmlsec1-mscrypto \
))
endif
endif
More information about the Libreoffice-commits
mailing list