diff options
| -rw-r--r-- | solenv/gbuild/CliUnoApi.mk | 4 | ||||
| -rw-r--r-- | testtools/CustomTarget_bridgetest_climaker.mk | 4 | ||||
| -rw-r--r-- | unoil/CustomTarget_climaker.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk index 008fa738634d..63ba9e75ffec 100644 --- a/solenv/gbuild/CliUnoApi.mk +++ b/solenv/gbuild/CliUnoApi.mk @@ -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 diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 370a73cc4d39..9610a23cfea5 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -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: diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk index 9d1ef46ad603..016f662b6992 100644 --- a/unoil/CustomTarget_climaker.mk +++ b/unoil/CustomTarget_climaker.mk @@ -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 \ |