diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-13 11:59:33 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-13 11:59:33 +0100 |
commit | 9fe9011fcf59b044fe8c2fa13bcb37949349536b (patch) | |
tree | 6b4b3c89c981fa18793e769e7a3380a646cf62b7 /liblangtag | |
parent | 2db711ac490f966acd8fb09acb66bd3fdff59664 (diff) |
liblangtag really does not need to be a shared library
Change-Id: I73f9422268f58ded971150f1ef16643885669ea3
Diffstat (limited to 'liblangtag')
-rw-r--r-- | liblangtag/ExternalPackage_langtag.mk | 17 | ||||
-rw-r--r-- | liblangtag/ExternalProject_langtag.mk | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/liblangtag/ExternalPackage_langtag.mk b/liblangtag/ExternalPackage_langtag.mk index fcfc53804a41..deb26157fd17 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 d7c3797c67ee..01744cdb0d50 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"),\ |