summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-05-23 23:01:05 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-06-07 15:14:25 +0200
commit85c6f80121230532485041e9fa2522d812eb3ca9 (patch)
treec0af95ab4fd957aeb49e7db67c23fb05e0c5b94e /i18npool
parentc154f180e22e5cd494b5c71453cb93f30fd71f6e (diff)
use .component files directly from workdir
Change-Id: Idaf2e1c33dcdf060756b5739c4a8d904dbdc699b
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/CustomTarget_localedata.mk27
-rw-r--r--i18npool/Module_i18npool.mk1
-rw-r--r--i18npool/Rdb_saxparser.mk16
3 files changed, 23 insertions, 21 deletions
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: