diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-04-29 12:54:39 -0300 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-30 13:08:05 +0200 |
| commit | eb190f135dc8fd0c22d9b10bae3788b259fce91a (patch) | |
| tree | 48a6c63a2e24b7e08daabdf0798fc5e965dec206 | |
| parent | 84be52b5f6b8a73cefd740e0bfdd5f0622c369e4 (diff) | |
fdo#60949: move last UNOLIBS_OOO to OOOLIBS
Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f
| -rw-r--r-- | Repository.mk | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Repository.mk b/Repository.mk index 296ffc8aa96f..76d6662b5539 100644 --- a/Repository.mk +++ b/Repository.mk @@ -225,6 +225,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ chartcore \ chartcontroller \ cppcanvas \ + configmgr \ ctl \ cui \ dba \ @@ -232,8 +233,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ dbmm \ $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \ dbaxml \ - deploymentmisc \ - $(if $(filter unx,$(GUIBASE)),desktop_detector) \ + deploymentmisc \ + $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ + $(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ editeng \ egi \ @@ -252,12 +254,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ for \ forui \ frm \ + fsstorage \ fwe \ fwi \ fwk \ fwl \ fwm \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ + i18npool \ icd \ icg \ idx \ @@ -270,6 +274,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ ira \ itg \ iti \ + localebe1 \ lng \ $(if $(MERGELIBS),merged) \ msfilter \ @@ -289,6 +294,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ + ucpexpand1 \ unordf \ unoxml \ utl \ @@ -634,15 +640,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ ) \ )) -$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ - configmgr \ - $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ - fsstorage \ - i18npool \ - localebe1 \ - ucpexpand1 \ -)) - $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ testtools_cppobj \ testtools_bridgetest \ |