[Libreoffice-commits] core.git: Library_merged.mk solenv/gbuild

[Stephan Bergmann]

 Library_merged.mk                              |    1 +
 solenv/gbuild/extensions/pre_MergedLibsList.mk |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87c28ddabc5c0dcbee8f15d8d9d2e7a75750b975
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 26 15:20:27 2016 +0200

    i18nlangtag must presumably be dropped from Library_merged.mk
    
    ...after 475e4b477c6d7ae114c3ae51ba4872882af67a68 "Move i18nlangtag lib to
    URELIB"?
    
    Change-Id: I45c5d997ed30757157109c67f30b91c4073c6b0a

diff --git a/Library_merged.mk b/Library_merged.mk
index 8247e5a..a225b81 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_library_objects,merged,\
 $(eval $(call gb_Library_use_libraries,merged,\
 	cppu \
 	cppuhelper \
+	i18nlangtag \
 	$(if $(ENABLE_JAVA), \
 		jvmaccess \
 		jvmfwk) \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 8c00bd3..6a985e3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -30,7 +30,6 @@ MERGE_LIBRARY_LIST := \
 	fwi \
 	fwk \
 	$(call gb_Helper_optional,DESKTOP,helplinker) \
-	i18nlangtag \
 	i18npool \
 	i18nutil \
 	lng \