RepositoryExternal.mk | 4 ++--
liblangtag/ExternalPackage_langtag.mk | 17 ++---------------
liblangtag/ExternalProject_langtag.mk | 2 +-
scp2/source/ooo/file_library_ooo.scp | 23 -----------------------
4 files changed, 5 insertions(+), 41 deletions(-)
New commits:
commit 9fe9011fcf59b044fe8c2fa13bcb37949349536b
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Nov 13 11:59:33 2012 +0100
liblangtag really does not need to be a shared library
Change-Id: I73f9422268f58ded971150f1ef16643885669ea3
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 734ed1f..dd666a6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -615,7 +615,7 @@ endef
else # !SYSTEM_LIBLANGTAG
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
langtag \
))
@@ -625,7 +625,7 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,langtag) \
$$(INCLUDE) \
)
-$(call gb_LinkTarget_use_libraries,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
langtag \
)
diff --git a/liblangtag/ExternalPackage_langtag.mk
b/liblangtag/ExternalPackage_langtag.mk
index fcfc538..deb2615 100644
--- a/liblangtag/ExternalPackage_langtag.mk
+++ b/liblangtag/ExternalPackage_langtag.mk
@@ -9,23 +9,10 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,langtag,langtag))
$(eval $(call gb_ExternalPackage_use_external_project,langtag,langtag))
-ifeq ($(GUI),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag-1.dll,liblangtag/.libs/liblangtag-1.dll))
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.dll.a,liblangtag/.libs/liblangtag.dll.a))
-else
+ifeq ($(GUI)$(COM),WNTMSC)
$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/langtag.lib,liblangtag/.libs/langtag.lib))
-endif
else
-ifeq ($(OS),MACOSX)
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.1.0.0.dylib,liblangtag/.libs/liblangtag.dylib))
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib))
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.dylib,liblangtag/.libs/liblangtag.dylib))
-else
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.so.1.0.0,liblangtag/.libs/liblangtag.so.1.0.0))
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.so.1,liblangtag/.libs/liblangtag.so.1))
-$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.so,liblangtag/.libs/liblangtag.so))
-endif
+$(eval $(call
gb_ExternalPackage_add_file,langtag,lib/liblangtag.a,liblangtag/.libs/liblangtag.a))
endif
# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/ExternalProject_langtag.mk
b/liblangtag/ExternalProject_langtag.mk
index d7c3797..01744cd 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(SOLARINC)") \
&& echo \
$(if $(filter
TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no")
>> config.cache \
- && ./configure -C --disable-modules --disable-test
--disable-introspection \
+ && ./configure -C --disable-modules --disable-test
--disable-introspection --disable-shared --enable-static --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(filter
NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(OUTDIR)/inc/external" \
$(if $(filter
MSC,$(COM)),LIBXML2_LIBS="$(OUTDIR)/lib/libxml2.lib",LIBXML2_LIBS="-L$(OUTDIR)/lib
-lxml2"),\
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 6d4839d..ee96344 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -740,29 +740,6 @@ End
#endif
-#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
-
-File gid_File_Lib_Langtag
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef MACOSX
- Name = STRING(CONCAT4(liblangtag,.,1,UNXSUFFIX));
- #elif defined WNT
- #if defined _gcc3
- Name = STRING(CONCAT4(liblangtag,-,1,.dll));
- #else
- // Nothing, statically linked to libi18nisolang1
- #endif
- #else
- // FIXME: use version vars
- Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,1));
- #endif
-End
-
-#endif // ENABLE_LIBLANGTAG
-
-
#ifdef SOLAR_JAVA
STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
