diff options
| -rw-r--r-- | RepositoryExternal.mk | 10 | ||||
| -rw-r--r-- | expat/Module_expat.mk | 3 | ||||
| -rw-r--r-- | expat/StaticLibrary_expat_x64.mk (renamed from expat/StaticLibrary_expat_xmltok_x64.mk) | 15 | ||||
| -rw-r--r-- | expat/StaticLibrary_expat_xmlparse_x64.mk | 32 |
4 files changed, 13 insertions, 47 deletions
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_xmltok_x64.mk b/expat/StaticLibrary_expat_x64.mk index e6415340aba5..bc5b641e18fb 100644 --- a/expat/StaticLibrary_expat_xmltok_x64.mk +++ b/expat/StaticLibrary_expat_x64.mk @@ -7,25 +7,26 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_StaticLibrary_StaticLibrary,expat_xmltok_x64)) +$(eval $(call gb_StaticLibrary_StaticLibrary,expat_x64)) -$(eval $(call gb_StaticLibrary_set_x64,expat_xmltok_x64,YES)) +$(eval $(call gb_StaticLibrary_set_x64,expat_x64,YES)) -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmltok_x64)) +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_x64)) -$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmltok_x64,expat)) +$(eval $(call gb_StaticLibrary_use_unpacked,expat_x64,expat)) -$(eval $(call gb_StaticLibrary_set_include,expat_xmltok_x64,\ +$(eval $(call gb_StaticLibrary_set_include,expat_x64,\ -I$(call gb_UnpackedTarball_get_dir,expat) \ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok_x64,\ +$(eval $(call gb_StaticLibrary_add_defs,expat_x64,\ -DXML_UNICODE \ -DCOMPILED_FROM_DSP \ )) -$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,expat_xmltok_x64,\ +$(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 \ )) 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: |