diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-10 23:24:08 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-11 16:44:24 +0200 |
| commit | d11cad2a76f9ac5e914dcc53808cee4990c2dbf4 (patch) | |
| tree | 8d72449d447811866a82c8a29e94980d3687e203 /Repository.mk | |
| parent | 60683b6de3f0ef0e9b22de5f5159086eb64e9f33 (diff) | |
fdo#60924: autoinstall more libraries
This autoinstall thing is quite cool because we don't need #ifdefs in
scp2. Conditions in Repository.mk are enough.
Change-Id: I31525a7e1d3bf0e4484f838483a829490621a241
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/Repository.mk b/Repository.mk index bb73ddc8d72e..de3bbd508701 100644 --- a/Repository.mk +++ b/Repository.mk @@ -217,24 +217,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif -ifeq ($(DISABLE_SCRIPTING),) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ - basctl \ -)) -endif -ifeq ($(OS),WNT) -ifeq ($(DISABLE_ATL),) -$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ - emser \ -)) -endif -endif - - $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ + avmedia \ + $(if $(DISABLE_SCRIPTING),,basctl) \ bib \ + canvastools \ chartcore \ chartcontroller \ + cppcanvas \ ctl \ cui \ dba \ @@ -243,7 +233,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ dbtools \ dbaxml \ drawinglayer \ + $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \ file \ + for \ + forui \ frm \ fwe \ fwi \ @@ -251,9 +244,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ fwm \ lng \ lwpft \ + $(if $(MERGELIBS),merged) \ sdbt \ odbcbase \ t602filter \ + $(if $(ENABLE_TELEPATHY),tubes) \ + unordf \ + unoxml \ wpftwriter \ writerfilter \ )) @@ -270,21 +267,17 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ - canvastools \ communi \ date \ evtatt \ - forui \ odbc \ oox \ ooxml \ sdbc \ AppleRemote \ - avmedia \ avmediaQuickTime \ basegfx \ calc \ - cppcanvas \ dbp \ dbu \ deploymentmisc \ @@ -305,7 +298,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ filtertracer \ flash \ flat \ - for \ fwk \ graphicfilter \ guesslang \ @@ -330,7 +322,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ lnth \ log \ MacOSXSpell \ - merged \ mork \ mozab2 \ mozabdrv \ @@ -385,9 +376,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ textfd \ tk \ tl \ - tubes \ - unordf \ - unoxml \ updatecheckui \ utl \ uui \ |