Repository.mk | 19 ++++++++-----------
solenv/gbuild/Helper.mk | 2 +-
solenv/gbuild/platform/IOS_ARM_GCC.mk | 5 +----
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 3 ---
solenv/gbuild/platform/android.mk | 2 --
solenv/gbuild/platform/com_MSC_class.mk | 2 --
solenv/gbuild/platform/macosx.mk | 2 --
solenv/gbuild/platform/solaris.mk | 2 --
solenv/gbuild/platform/unxgcc.mk | 2 --
9 files changed, 10 insertions(+), 29 deletions(-)
New commits:
commit 22e1a5b836b898298b6a5cfbaf1c82d9c3f08349
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Tue Apr 30 12:39:05 2013 +0200
gbuild: UNOLIBS_OOO group is no more
Change-Id: I1b239844391c0d59fc26e44f789cc39ed602f54b
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 0ca26a0..3130bf7 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -117,7 +117,7 @@ endef
define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
-gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO
RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
+gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO
RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 998cc6f..13a9b08 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -95,8 +95,7 @@ gb_LinkTarget_OBJCFLAGS += $(gb_DEBUG_CFLAGS)
endif
define gb_LinkTarget__get_liblinkflags
-$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out
$(gb_Library_UNOLIBS_OOO),$(1)),$(call gb_Library_get_filename,$(lib)))) \
-$(foreach lib,$(filter
$(gb_Library_UNOLIBS_OOO),$(1)),$(SOLARVER)/$(INPATH)/lib/$(lib)$(gb_Library_UNOEXT))
+$(patsubst lib%.a,-l%,$(foreach lib,$(1),$(call
gb_Library_get_filename,$(lib)))) \
endef
define gb_LinkTarget__get_layer
@@ -178,7 +177,6 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -189,7 +187,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
- $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 8df958f..29aa4af 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -222,7 +222,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
@@ -233,7 +232,6 @@ gb_Library_FILENAMES :=\
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT))
\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -245,7 +243,6 @@ gb_Library_DLLFILENAMES :=\
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \
$(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
diff --git a/solenv/gbuild/platform/android.mk
b/solenv/gbuild/platform/android.mk
index 215ebfd..aec9858 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -78,7 +78,6 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
\
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT))
\
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
@@ -93,7 +92,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
- $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 4d6b264..83d5d45 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -270,7 +270,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
@@ -292,7 +291,6 @@ gb_Library_DLLFILENAMES :=\
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \
$(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index b3cb175..3a20464 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -224,7 +224,6 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -236,7 +235,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index cddb870..43d4e1b 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -257,7 +257,6 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -268,7 +267,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 63e912a..bbfe168 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -256,7 +256,6 @@ gb_Library_FILENAMES := \
$(foreach
lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT))
\
$(foreach
lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
- $(foreach
lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
\
$(foreach
lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -267,7 +266,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
- $(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
commit eb190f135dc8fd0c22d9b10bae3788b259fce91a
Author: Marcos Paulo de Souza <marcos.souza....@gmail.com>
Date: Mon Apr 29 12:54:39 2013 -0300
fdo#60949: move last UNOLIBS_OOO to OOOLIBS
Change-Id: I79af32f188a0e7de71ec8e6743fe73b3bb030a3f
diff --git a/Repository.mk b/Repository.mk
index 296ffc8..76d6662 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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
