diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-05-29 20:24:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-30 08:45:46 +0200 |
| commit | cf4a1c42d6a90ec73ab1504d4bfaf3004bad33da (patch) | |
| tree | 14b2d0207c55ae53fb141cf6a038ce9c33d5956f /sax | |
| parent | dc50abb7f972c53fcca08d2ac3627e7848456520 (diff) | |
merge expwrap into sax library
there is no need for 2 shared libs for such a small module
Change-Id: Id28c9038f3e16931bfb8af3532eca172998da1aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152374
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/CppunitTest_sax_parser.mk | 1 | ||||
| -rw-r--r-- | sax/Library_expwrap.mk | 52 | ||||
| -rw-r--r-- | sax/Library_sax.mk | 15 | ||||
| -rw-r--r-- | sax/Module_sax.mk | 1 |
4 files changed, 15 insertions, 54 deletions
diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index 59a90fd13f67..27dfc15fed39 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -20,7 +20,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ cppu \ cppuhelper \ unotest \ - expwrap \ sal \ sax \ test \ diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk deleted file mode 100644 index 3f79ba31b8f2..000000000000 --- a/sax/Library_expwrap.mk +++ /dev/null @@ -1,52 +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_Library_Library,expwrap)) - -$(eval $(call gb_Library_set_componentfile,expwrap,sax/source/expatwrap/expwrap,services)) - -$(eval $(call gb_Library_set_include,expwrap,\ - -I$(SRCDIR)/sax/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Library_use_common_precompiled_header,expwrap)) - -$(eval $(call gb_Library_add_defs,expwrap,\ - -DFASTSAX_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_use_sdk_api,expwrap)) - -$(eval $(call gb_Library_use_externals,expwrap,\ - boost_headers \ - libxml2 \ - expat \ - zlib \ -)) - -$(eval $(call gb_Library_use_libraries,expwrap,\ - comphelper \ - cppu \ - cppuhelper \ - sal \ - salhelper \ - sax \ - tl \ -)) - -$(eval $(call gb_Library_add_exception_objects,expwrap,\ - sax/source/expatwrap/sax_expat \ - sax/source/expatwrap/saxwriter \ - sax/source/expatwrap/xml2utf \ - sax/source/fastparser/fastparser \ - sax/source/fastparser/legacyfastparser \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 6e84a042614d..aecde51a41dd 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Library_Library,sax)) +$(eval $(call gb_Library_set_componentfile,sax,sax/source/expatwrap/expwrap,services)) + $(eval $(call gb_Library_set_include,sax,\ -I$(SRCDIR)/sax/inc \ $$(INCLUDE) \ @@ -20,11 +22,19 @@ $(eval $(call gb_Library_use_common_precompiled_header,sax)) $(eval $(call gb_Library_use_sdk_api,sax)) +$(eval $(call gb_Library_use_externals,sax,\ + boost_headers \ + libxml2 \ + expat \ + zlib \ +)) + $(eval $(call gb_Library_use_libraries,sax,\ comphelper \ cppu \ cppuhelper \ sal \ + salhelper \ tl \ )) @@ -33,6 +43,11 @@ $(eval $(call gb_Library_add_defs,sax,\ )) $(eval $(call gb_Library_add_exception_objects,sax,\ + sax/source/expatwrap/sax_expat \ + sax/source/expatwrap/saxwriter \ + sax/source/expatwrap/xml2utf \ + sax/source/fastparser/fastparser \ + sax/source/fastparser/legacyfastparser \ sax/source/tools/converter \ sax/source/tools/fastattribs \ sax/source/tools/fastserializer \ diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk index 4fca4efdc289..2c0b9596a84d 100644 --- a/sax/Module_sax.mk +++ b/sax/Module_sax.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,sax)) $(eval $(call gb_Module_add_targets,sax,\ - Library_expwrap \ Library_sax \ )) |