Kaydet (Commit) 16a1bf5d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

climaker no longer needs *.rdb.oldformat input files

Change-Id: I55447aba5abcc8205543c7ca64763b5c99854837
üst 1728ab71
......@@ -68,13 +68,13 @@ $(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_VERSION := $(2)
endef
define gb_CliUnoApiTarget_wrap_api
$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_API := $(call gb_UnoApiTarget_get_target,$(2)).oldformat
$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_API := $(call gb_UnoApiTarget_get_target,$(2))
$(call gb_CliUnoApiTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(2))
endef
define gb_CliUnoApiTarget__use_api
$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_DEPS += $(2).oldformat
$(call gb_CliUnoApiTarget_get_target,$(1)) : CLI_UNOAPI_DEPS += $(2)
$(call gb_CliUnoApiTarget_get_target,$(1)) : $(2)
endef
......
......@@ -42,7 +42,7 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \
$(call gb_Helper_execute,climaker) \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
--out $@ -r $(OUTDIR)/bin/cli_uretypes.dll \
-X $(call gb_UnoApiTarget_get_target,udkapi).oldformat \
$(call gb_UnoApiTarget_get_target,bridgetest).oldformat > /dev/null)
-X $(call gb_UnoApiTarget_get_target,udkapi) \
$(call gb_UnoApiTarget_get_target,bridgetest) > /dev/null)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
......@@ -32,10 +32,10 @@ $(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
--assembly-company "LibreOffice" \
--assembly-description "This assembly contains metadata for the LibreOffice API." \
-X $(call gb_UnoApiTarget_get_target,udkapi).oldformat \
-X $(call gb_UnoApiTarget_get_target,udkapi) \
-r $(OUTDIR)/bin/cli_uretypes.dll \
--keyfile $(OUTDIR)/bin/cliuno.snk \
$(call gb_UnoApiTarget_get_target,offapi).oldformat) > /dev/null)
$(call gb_UnoApiTarget_get_target,offapi)) > /dev/null)
$(unoil_CLIDIR)/cli_oootypes.config : \
$(SRCDIR)/unoil/climaker/cli_oootypes_config \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment