diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | i18npool/CustomTarget_localedata.mk | 27 | ||||
| -rw-r--r-- | i18npool/Module_i18npool.mk | 1 | ||||
| -rw-r--r-- | i18npool/Rdb_saxparser.mk | 16 | ||||
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Pyuno.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Rdb.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 3 |
12 files changed, 36 insertions, 41 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index dd48febd323e..3bb68e016907 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2966,7 +2966,7 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ - ,$(call gb_ComponentTarget_get_outdir_target_for_build,$(component))) \ + ,$(call gb_ComponentTarget_get_target_for_build,$(component))) \ $(call gb_AllLangResTarget_get_target,ofa) \ $(call gb_Configuration_get_target,registry) \ $(call gb_Configuration_get_target,fcfg_langpack) \ @@ -3016,9 +3016,9 @@ endef # FIXME: the library target should be for build too define gb_Executable__register_saxparser $(call gb_Executable_add_runtime_dependencies,saxparser,\ - $(call gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ + $(call gb_Rdb_get_outdir_target_for_build,saxparser) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ $(call gb_UnoApi_get_target,udkapi) \ ) diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index 7e8774c77b8b..f10769fba9cb 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -9,24 +9,21 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata)) -i18npool_LDDIR := $(call gb_CustomTarget_get_workdir,i18npool/localedata) - i18npool_LD_NAMES := $(basename $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) -$(call gb_CustomTarget_get_target,i18npool/localedata) : \ - $(foreach name,$(i18npool_LD_NAMES),$(i18npool_LDDIR)/localedata_$(name).cxx) +$(eval $(call gb_CustomTarget_register_targets,i18npool/localedata,\ + $(foreach name,$(i18npool_LD_NAMES),localedata_$(name).cxx) \ +)) define i18npool_LD_RULE -$(i18npool_LDDIR)/localedata_$(1).cxx : \ +$(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \ $(SRCDIR)/i18npool/source/localedata/data/$(1).xml \ - $(i18npool_LDDIR)/saxparser.rdb \ | $(call gb_Executable_get_runtime_dependencies,saxparser) $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1) $$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \ - $(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb) \ - -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \ - -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb)) \ + -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \ + -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target_for_build,saxparser)) \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \ rm $$@.tmp) @@ -35,16 +32,4 @@ endef $(foreach name,$(i18npool_LD_NAMES),$(eval $(call i18npool_LD_RULE,$(name)))) -$(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \ - $(SOLARENV)/bin/packcomponents.xslt \ - | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1) - $(call gb_Helper_abbreviate_dirs, \ - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ - -o $@ $(SOLARENV)/bin/packcomponents.xslt $<) - -$(i18npool_LDDIR)/saxparser.input : $(call gb_ComponentTarget_get_outdir_target,sax/source/expatwrap/expwrap) | $(i18npool_LDDIR)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@ - # vim: set noet sw=4 ts=4: diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 1f78d518c828..73b0110cd404 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets_for_build,i18npool,\ Executable_gendict \ Executable_genindex_data \ Executable_saxparser \ + Rdb_saxparser \ )) $(eval $(call gb_Module_add_check_targets,i18npool,\ diff --git a/i18npool/Rdb_saxparser.mk b/i18npool/Rdb_saxparser.mk new file mode 100644 index 000000000000..f3c2dda7cded --- /dev/null +++ b/i18npool/Rdb_saxparser.mk @@ -0,0 +1,16 @@ +# -*- 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_Rdb_Rdb,saxparser)) + +$(eval $(call gb_Rdb_add_components,saxparser,\ + sax/source/expatwrap/expwrap \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 7d97197c07a6..0957f9f5527d 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -38,8 +38,7 @@ endef $(call gb_ComponentTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CMP,1) - rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \ - $(call gb_ComponentTarget_get_target,$*) \ + rm -f $(call gb_ComponentTarget_get_target,$*) \ # when a library is renamed, the component file needs to be rebuilt to match. @@ -54,10 +53,6 @@ $(call gb_ComponentTarget_get_target,%) : \ define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) -$(call gb_ComponentTarget_get_outdir_target,$(1)) : \ - $(call gb_ComponentTarget_get_target,$(1)) \ - | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) endef diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index bf209d676e24..fd4b1222d5d5 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -243,9 +243,9 @@ endef define gb_CppunitTest_use_component $(call gb_CppunitTest_get_target,$(1)) : \ - $(call gb_ComponentTarget_get_outdir_target,$(2)) + $(call gb_ComponentTarget_get_target,$(2)) $(call gb_CppunitTest_get_target,$(1)) : \ - UNO_SERVICES += $(call gb_ComponentTarget_get_outdir_target,$(2)) + UNO_SERVICES += $(call gb_ComponentTarget_get_target,$(2)) endef diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 5ce7a6b78675..5d96f97e16ce 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -35,7 +35,7 @@ gb_Gallery_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl # TODO: this should be in RepositoryExternal.mk, but it would lead to # duplication. Fix. gb_Gallery_EXTRA_DEPENCENCIES := \ - $(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call gb_ComponentTarget_get_outdir_target_for_build,$(component))) \ + $(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call gb_ComponentTarget_get_target_for_build,$(component))) \ $(foreach api,$(gb_Gallery__UNO_TYPES),$(call gb_UnoApi_get_target,$(api))) gb_Gallery_INSTDIR := share/gallery @@ -47,7 +47,7 @@ define gb_Gallery__make_env_args module:$(call gb_Helper_make_url,$(gb_Configuration_registry)/spool)" \ "-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target_for_build,ure/services)) \ $(foreach item,$(gb_Gallery__UNO_COMPONENTS),\ - $(call gb_Helper_make_url,$(call gb_ComponentTarget_get_outdir_target_for_build,$(item))))" \ + $(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \ "-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\ $(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \ $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 889cc48d9b0f..99f02d9548fe 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -301,8 +301,7 @@ gb_Jar__get_componentprefix = \ # layer must be specified explicitly in this macro (different to libraries) define gb_Jar_set_componentfile $(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Jar__get_componentprefix,$(3)),$(notdir $(call gb_Jar_get_target,$(1)))) -$(call gb_Jar_get_target,$(1)) : \ - $(call gb_ComponentTarget_get_outdir_target,$(2)) +$(call gb_Jar_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) $(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2)) endef diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 1174a08dc7bf..7b328bd0944f 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -151,7 +151,7 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\ $(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\ $(call gb_Library_get_runtime_filename,$(gb_Library__get_name))) $(call gb_Library__get_final_target,$(gb_Library__get_name)) : \ - $(call gb_ComponentTarget_get_outdir_target,$(2)) + $(call gb_ComponentTarget_get_target,$(2)) $(call gb_ComponentTarget_get_target,$(2)) :| \ $(call gb_Library_get_target,$(gb_Library__get_name)) $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \ diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index 267f2b4446ce..498a4de71d63 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -60,7 +60,7 @@ gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule: define gb_Pyuno_set_componentfile_full $(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4)) -$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) +$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2)) endef diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 9246b793bb90..5bfa3a2113af 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -12,7 +12,7 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ (\ echo '<list>' && \ - $(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_outdir_target,$(component))</filename>" &&) \ + $(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>" &&) \ echo '</list>' \ ) > $(1).input && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt $(1).input && \ @@ -40,7 +40,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Rdb,$(call gb_Rdb_get_outdir_tar endef define gb_Rdb_add_component -$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) +$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 09b2eb6b737b..1a33fb53607d 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -22,8 +22,6 @@ gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT) gb_CliNativeLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLibrary_EXT) gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT) -gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component -gb_ComponentTarget_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/xml/component/$(1).component gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT) gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build) gb_Extension_get_target = $(OUTDIR)/bin/$(1).oxt @@ -86,6 +84,7 @@ gb_CliNativeLibraryTarget_get_external_target = $(WORKDIR)/CliNativeLibraryTarge gb_CliNativeLibraryTarget_get_target = $(WORKDIR)/CliNativeLibraryTarget/$(1)$(gb_CliNativeLibraryTarget_EXT) gb_CliUnoApiTarget_get_target = $(WORKDIR)/CliUnoApiTarget/$(1)$(gb_CliUnoApiTarget_EXT) gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component +gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$(1).component gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test gb_CppunitTestFakeExecutable_get_target = \ |