From abc873feb3c805fd1f7c0a4b9b4a236617ec9ff7 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 25 Oct 2012 13:02:55 +0200 Subject: expat: for 64bit 1 static library is enough, only utf16 variant used Change-Id: I98a3428578b52c6d9d7210a8fb0211876d6f7cae --- RepositoryExternal.mk | 10 ++++----- expat/Module_expat.mk | 3 +-- expat/StaticLibrary_expat_x64.mk | 34 +++++++++++++++++++++++++++++++ expat/StaticLibrary_expat_xmlparse_x64.mk | 32 ----------------------------- expat/StaticLibrary_expat_xmltok_x64.mk | 33 ------------------------------ 5 files changed, 39 insertions(+), 73 deletions(-) create mode 100644 expat/StaticLibrary_expat_x64.mk delete mode 100644 expat/StaticLibrary_expat_xmlparse_x64.mk delete mode 100644 expat/StaticLibrary_expat_xmltok_x64.mk diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5847c4672ee1..f6f32140bb64 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -237,8 +237,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ascii_expat_xmlparse \ expat_xmlparse \ expat_xmltok \ - expat_xmlparse_x64 \ - expat_xmltok_x64 \ + expat_x64 \ )) define gb_LinkTarget__use_expat @@ -256,7 +255,6 @@ $(if $(filter-out ascii_expat_xmlparse,$(2)),\ $(call gb_LinkTarget_use_static_libraries,$(1),\ $(2) \ - $(3)\ ) endef @@ -265,17 +263,17 @@ endif # SYSTEM_EXPAT # now define 2 wrappers that select which internal static library to use... define gb_LinkTarget__use_expat_utf8 -$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse,expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse expat_xmltok) endef define gb_LinkTarget__use_expat_utf16 -$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse,expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse expat_xmltok) endef define gb_LinkTarget__use_expat_utf16_x64 -$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse_x64,expat_xmltok_x64) +$(call gb_LinkTarget__use_expat,$(1),expat_x64) endef diff --git a/expat/Module_expat.mk b/expat/Module_expat.mk index bc68fcb7c6b3..377047433568 100644 --- a/expat/Module_expat.mk +++ b/expat/Module_expat.mk @@ -38,8 +38,7 @@ endif #--------------------------------------------------------- ifeq ($(BUILD_X64),TRUE) $(eval $(call gb_Module_add_targets,expat,\ - StaticLibrary_expat_xmlparse_x64 \ - StaticLibrary_expat_xmltok_x64 \ + StaticLibrary_expat_x64 \ )) endif diff --git a/expat/StaticLibrary_expat_x64.mk b/expat/StaticLibrary_expat_x64.mk new file mode 100644 index 000000000000..bc5b641e18fb --- /dev/null +++ b/expat/StaticLibrary_expat_x64.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,expat_x64)) + +$(eval $(call gb_StaticLibrary_set_x64,expat_x64,YES)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_x64)) + +$(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat)) + +$(eval $(call gb_StaticLibrary_set_include,expat_x64,\ + -I$(call gb_UnpackedTarball_get_dir,expat) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,expat_x64,\ + -DXML_UNICODE \ + -DCOMPILED_FROM_DSP \ +)) + +$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_x64,\ + UnpackedTarball/expat/lib/xmlparse_x64 \ + UnpackedTarball/expat/lib/xmltok_x64 \ + UnpackedTarball/expat/lib/xmlrole_x64 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/expat/StaticLibrary_expat_xmlparse_x64.mk b/expat/StaticLibrary_expat_xmlparse_x64.mk deleted file mode 100644 index 97cf472eb5ee..000000000000 --- a/expat/StaticLibrary_expat_xmlparse_x64.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,expat_xmlparse_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,expat_xmlparse_x64,YES)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmlparse_x64)) - -$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmlparse_x64,expat)) - -$(eval $(call gb_StaticLibrary_set_include,expat_xmlparse_x64,\ - -I$(call gb_UnpackedTarball_get_dir,expat) \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse_x64,\ - -DCOMPILED_FROM_DSP \ - -DXML_UNICODE \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_xmlparse_x64,\ - UnpackedTarball/expat/lib/xmlparse_x64 \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/expat/StaticLibrary_expat_xmltok_x64.mk b/expat/StaticLibrary_expat_xmltok_x64.mk deleted file mode 100644 index e6415340aba5..000000000000 --- a/expat/StaticLibrary_expat_xmltok_x64.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,expat_xmltok_x64)) - -$(eval $(call gb_StaticLibrary_set_x64,expat_xmltok_x64,YES)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmltok_x64)) - -$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmltok_x64,expat)) - -$(eval $(call gb_StaticLibrary_set_include,expat_xmltok_x64,\ - -I$(call gb_UnpackedTarball_get_dir,expat) \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok_x64,\ - -DXML_UNICODE \ - -DCOMPILED_FROM_DSP \ -)) - -$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_xmltok_x64,\ - UnpackedTarball/expat/lib/xmltok_x64 \ - UnpackedTarball/expat/lib/xmlrole_x64 \ -)) - -# vim: set noet sw=4 ts=4: -- cgit