mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add runtime deps for custom targets

Browse Source 
Change-Id: I49272003ea72c84c9e81bc826820b0ac5f9d5008
This commit is contained in:
David Tardon
2012-12-30 12:27:04 +01:00
parent 0d6f8e5c04
commit edf6730fd5
18 changed files with 76 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
RepositoryExternal.mk
View File

@@ -2482,6 +2482,59 @@ endif # SYSTEM_JFREEREPORT
# Executables # Executables
# FIXME: the library target should be for build too
define gb_Executable__register_bestreversemap
$(call gb_Executable_add_runtime_dependencies,bestreversemap,\
$(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \
)
endef
ifneq ($(SYSTEM_ICU),YES)
define gb_Executable__register_gendict
$(call gb_Executable_add_runtime_dependencies,gendict,\
$(call gb_Package_get_target_for_build,icu) \
)
endef
endif
define gb_Executable__register_localize
$(call gb_Executable_add_runtime_dependencies,localize,\
$(foreach exec,cfgex helpex propex transex3 treex uiex ulfex xrmex,\
$(call gb_Executable_get_runtime_dependencies,$(exec)) \
) \
)
endef
# The dependencies on ure/services.rdb and ure/types.rdb are implicitly required
# due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc:
# FIXME: the library target should be for build too
define gb_Executable__register_saxparser
$(call gb_Executable_add_runtime_dependencies,saxparser,\
$(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,ure/services) \
$(call gb_UnoApiMerge_get_target_for_build,ure/types) \
)
endef
# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly
# required due to the settings for URE_SERVICES and URE_TYPES in
# cppuhelper/source/unorc
# FIXME: the library target should be for build too
define gb_Executable__register_uno
$(call gb_Executable_add_runtime_dependencies,uno,\
$(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,ure/services) \
$(call gb_UnoApiMerge_get_target_for_build,ure/types) \
)
endef
# External executables
ifneq ($(SYSTEM_LIBXML_FOR_BUILD),YES) ifneq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
gb_ExternalExecutable__register_xmllint := gb_ExternalExecutable__register_xmllint :=

8
i18npool/CustomTarget_breakiterator.mk
View File

@@ -30,18 +30,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator) i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
ifeq ($(SYSTEM_ICU),NO)
i18npool_ICUTARGET := $(call gb_ExternalPackage_get_target,icu)
else
i18npool_ICUTARGET :=
endif
$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
$(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c $(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c
$(i18npool_BIDIR)/dict_%.cxx : \ $(i18npool_BIDIR)/dict_%.cxx : \
$(SRCDIR)/i18npool/source/breakiterator/data/%.dic \ $(SRCDIR)/i18npool/source/breakiterator/data/%.dic \
$(call gb_Executable_get_target_for_build,gendict) $(i18npool_ICUTARGET) \ $(call gb_Executable_get_runtime_dependencies,gendict) \
| $(i18npool_BIDIR)/.dir | $(i18npool_BIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\

2
i18npool/CustomTarget_collator.mk
View File

@@ -56,7 +56,7 @@ $(call gb_CustomTarget_get_target,i18npool/collator) : $(SRCDIR)/i18npool/Custom
$(i18npool_CODIR)/collator_%.cxx : \ $(i18npool_CODIR)/collator_%.cxx : \
$(SRCDIR)/i18npool/source/collator/data/%.txt \ $(SRCDIR)/i18npool/source/collator/data/%.txt \
$(call gb_Executable_get_target_for_build,gencoll_rule) \ $(call gb_Executable_get_runtime_dependencies,gencoll_rule) \
| $(i18npool_CODIR)/.dir | $(i18npool_CODIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \

2
i18npool/CustomTarget_indexentry.mk
View File

@@ -45,7 +45,7 @@ $(call gb_CustomTarget_get_target,i18npool/indexentry) : $(SRCDIR)/i18npool/Cust
$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \ $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \
$(SRCDIR)/i18npool/source/indexentry/data/%.txt \ $(SRCDIR)/i18npool/source/indexentry/data/%.txt \
$(call gb_Executable_get_target_for_build,genindex_data) \ $(call gb_Executable_get_runtime_dependencies,genindex_data) \
| $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/.dir | $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \

8
i18npool/CustomTarget_localedata.mk
View File

@@ -34,16 +34,10 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \
$(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \ $(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \
$(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
# The dependencies on ure/services.rdb and ure/types.rdb are implicitly required
# due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc:
$(i18npool_LDDIR)/localedata_%.cxx : \ $(i18npool_LDDIR)/localedata_%.cxx : \
$(SRCDIR)/i18npool/source/localedata/data/%.xml \ $(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(i18npool_LDDIR)/saxparser.rdb \ $(i18npool_LDDIR)/saxparser.rdb \
$(call gb_UnoApiMerge_get_target_for_build,ure/types) \ $(call gb_Executable_get_runtime_dependencies,saxparser)
$(call gb_Executable_get_target_for_build,saxparser) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,saxparser) $* $< $@.tmp \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \

2
i18npool/CustomTarget_textconversion.mk
View File

@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,i18npool/textconversion) : \
$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \ $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \
$(SRCDIR)/i18npool/source/textconversion/data/%.dic \ $(SRCDIR)/i18npool/source/textconversion/data/%.dic \
$(call gb_Executable_get_target_for_build,genconv_dict) \ $(call gb_Executable_get_runtime_dependencies,genconv_dict) \
| $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/.dir | $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \

2
jurt/CustomTarget_test_urp.mk
View File

@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp)
$(jurt_TESTURP)/done : \ $(jurt_TESTURP)/done : \
$(call gb_UnoApiTarget_get_target,test_urp) \ $(call gb_UnoApiTarget_get_target,test_urp) \
$(OUTDIR)/bin/udkapi.rdb \ $(OUTDIR)/bin/udkapi.rdb \
$(call gb_Executable_get_target_for_build,javamaker) $(call gb_Executable_get_runtime_dependencies,javamaker)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
rm -rf $(jurt_TESTURP) && \ rm -rf $(jurt_TESTURP) && \
$(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/udkapi.rdb) && \ $(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/udkapi.rdb) && \

7
librelogo/CustomTarget_librelogo.mk
View File

@@ -32,17 +32,14 @@ librelogo_LANGS := $(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG)))
$(eval $(foreach lang,$(librelogo_LANGS),$(call librelogo_Properties_Properties,$(subst -,_,$(lang)),$(lang)))) $(eval $(foreach lang,$(librelogo_LANGS),$(call librelogo_Properties_Properties,$(subst -,_,$(lang)),$(lang))))
endif endif
librelogo_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propex)
librelogo_PROPMERGECOMMAND := $(gb_Helper_set_ld_path) $(librelogo_PROPMERGETARGET)
$(librelogo_DIR)/LibreLogo_%.properties : \ $(librelogo_DIR)/LibreLogo_%.properties : \
$(librelogo_PROPMERGETARGET) \ $(call gb_Executable_get_runtime_dependencies,propex) \
| $(librelogo_DIR)/.dir | $(librelogo_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILE) > $${MERGEINPUT} && \ echo $(POFILE) > $${MERGEINPUT} && \
$(librelogo_PROPMERGECOMMAND) \ $(call gb_Executable_get_command,propex) \
-p librelogo \ -p librelogo \
-i $(SOURCE) \ -i $(SOURCE) \
-o $@ \ -o $@ \

7
readlicense_oo/CustomTarget_readme.mk
View File

@@ -23,9 +23,6 @@ readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_o
readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/readme_%.txt readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/readme_%.txt
endif endif
readlicense_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex)
readlicense_XRMEXCOMMAND := $(gb_Helper_set_ld_path) $(readlicense_XRMEXTARGET)
$(call gb_CustomTarget_get_target,readlicense_oo/readme) : $(readlicense_oo_READMEs) $(call gb_CustomTarget_get_target,readlicense_oo/readme) : $(readlicense_oo_READMEs)
ifeq ($(strip $(gb_WITH_LANG)),) ifeq ($(strip $(gb_WITH_LANG)),)
@@ -35,14 +32,14 @@ readlicense_oo_README_XRM := $(readlicense_oo_DIR)/readme.xrm
$(readlicense_oo_DIR)/readme.xrm : \ $(readlicense_oo_DIR)/readme.xrm : \
$(SRCDIR)/readlicense_oo/docs/readme.xrm \ $(SRCDIR)/readlicense_oo/docs/readme.xrm \
$(readlicense_XRMEXTARGET) \ $(call gb_Executable_get_runtime_dependencies,xrmex) \
$(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) \ $(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) \
| $(readlicense_oo_DIR)/.dir | $(readlicense_oo_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
MERGEINPUT=`$(gb_MKTEMP)` && \ MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) > $${MERGEINPUT} && \ echo $(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) > $${MERGEINPUT} && \
$(readlicense_XRMEXCOMMAND) \ $(call gb_Executable_get_command,xrmex) \
-p readlicense_oo \ -p readlicense_oo \
-i $< \ -i $< \
-o $@ \ -o $@ \

2
ridljar/CustomTarget_javamaker.mk
View File

@@ -32,7 +32,7 @@ ridljar_DIR := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(ridljar_DIR)/done $(call gb_CustomTarget_get_target,ridljar/javamaker) : $(ridljar_DIR)/done
$(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \ $(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \
$(call gb_Executable_get_target_for_build,javamaker) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(ridljar_DIR)/.dir | $(ridljar_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \

6
shell/CustomTarget_shlxthdl_res.mk
View File

@@ -35,15 +35,15 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \ $(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \ $(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \ $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
| $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \ $(call gb_Executable_get_runtime_dependencies,lngconvex) \
$(call gb_Executable_get_target_for_build,lngconvex) | $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \ cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \ BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \
$(call gb_Executable_get_target_for_build,lngconvex) \ $(call gb_Executable_get_command,lngconvex) \
-ulf shlxthdl.ulf \ -ulf shlxthdl.ulf \
-rc $@ \ -rc $@ \
-rct rctmpl.txt \ -rct rctmpl.txt \

2
testtools/CustomTarget_bridgetest_climaker.mk
View File

@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \
$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \ $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_target_for_build,climaker) \ $(call gb_Executable_get_runtime_dependencies,climaker) \
| $(testtools_CLIDIR)/.dir | $(testtools_CLIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \

2
testtools/CustomTarget_bridgetest_javamaker.mk
View File

@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_
$(testtools_JAVADIR)/done : \ $(testtools_JAVADIR)/done : \
$(call gb_UnoApiTarget_get_target,bridgetest) \ $(call gb_UnoApiTarget_get_target,bridgetest) \
$(OUTDIR)/bin/types.rdb \ $(OUTDIR)/bin/types.rdb \
$(call gb_Executable_get_target_for_build,javamaker) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(testtools_JAVADIR)/.dir | $(testtools_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \

15
testtools/CustomTarget_uno_test.mk
View File

@@ -29,21 +29,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
# this target is phony to run it every time # this target is phony to run it every time
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test) .PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly
# required due to the settings for URE_SERVICES and URE_TYPES in
# cppuhelper/source/unorc; the dependency on ure/services.rdb is also there
# because we need some of the URE libs from stoc and this is the easiest way to
# ensure they are available when the test is run .-)
$(call gb_CustomTarget_get_target,testtools/uno_test) : \ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Executable_get_target_for_build,uno) \ $(call gb_Executable_get_runtime_dependencies,uno) \
$(call gb_InternalUnoApi_get_target,bridgetest) \ $(call gb_InternalUnoApi_get_target,bridgetest) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Rdb_get_outdir_target,uno_services)
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target,uno_services) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApiMerge_get_target_for_build,ure/types)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_target_for_build,uno) \ $(call gb_Executable_get_command,uno) \
-s com.sun.star.test.bridge.BridgeTest \ -s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.CppTestObject \ -- com.sun.star.test.bridge.CppTestObject \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \

3
tools/CustomTarget_reversemap.mk
View File

@@ -29,8 +29,7 @@ $(call gb_CustomTarget_get_target,tools/reversemap) : \
$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx $(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx
$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \ $(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \
$(call gb_Executable_get_target_for_build,bestreversemap) \ $(call gb_Executable_get_runtime_dependencies,bestreversemap) \
| $(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \
$(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir $(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
$(call gb_Helper_execute,bestreversemap > $@) $(call gb_Helper_execute,bestreversemap > $@)

2
touch/CustomTarget_touch_javamaker.mk
View File

@@ -13,7 +13,7 @@ touch_javamaker_DIR := $(call gb_CustomTarget_get_workdir,touch)
$(call gb_CustomTarget_get_target,touch/touch_javamaker) : $(touch_javamaker_DIR)/done $(call gb_CustomTarget_get_target,touch/touch_javamaker) : $(touch_javamaker_DIR)/done
$(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(OUTDIR)/bin/types.rdb \ $(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(OUTDIR)/bin/types.rdb \
$(call gb_Executable_get_target_for_build,javamaker) | $(touch_javamaker_DIR)/.dir $(call gb_Executable_get_runtime_dependencies,javamaker) | $(touch_javamaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
rm -r $(touch_javamaker_DIR) && \ rm -r $(touch_javamaker_DIR) && \

2
unoil/CustomTarget_climaker.mk
View File

@@ -39,7 +39,7 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \
$(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
$(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \ $(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_target_for_build,climaker) \ $(call gb_Executable_get_runtime_dependencies,climaker) \
| $(unoil_CLIDIR)/.dir | $(unoil_CLIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \

2
unoil/CustomTarget_javamaker.mk
View File

@@ -32,7 +32,7 @@ unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
$(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done $(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done
$(unoil_JAVADIR)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ $(unoil_JAVADIR)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
$(call gb_Executable_get_target_for_build,javamaker) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(unoil_JAVADIR)/.dir | $(unoil_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \