diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-24 10:42:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-24 10:51:31 +0200 |
| commit | ab149c7e3f9bb4be6f3c7d26401b67a0635c13ab (patch) | |
| tree | fbc29c9f7d8af2bd5d9223949e29c28a68fb0417 /touch/CustomTarget_touch_javamaker.mk | |
| parent | 294ad90704b7b19aa64c26bfa83442a96a31e57b (diff) | |
Get rid of UnoApiMerge_uretypes, which is just a duplicate of UnoApi_udkapi
What is a little confusing is that the udkapi.rdb ends up as types.rdb in the
installation set (in the URE's sub-tree). So all places that reference it
during the build do so as "udkapi" while all places that reference it in an
installation set do so as "types."
Change-Id: I35d0695966b3bd703f5494b636b9782efc0d3fcb
Diffstat (limited to 'touch/CustomTarget_touch_javamaker.mk')
| -rw-r--r-- | touch/CustomTarget_touch_javamaker.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/touch/CustomTarget_touch_javamaker.mk b/touch/CustomTarget_touch_javamaker.mk index 40e627993224..e833fa4c17d6 100644 --- a/touch/CustomTarget_touch_javamaker.mk +++ b/touch/CustomTarget_touch_javamaker.mk @@ -12,11 +12,11 @@ touch_javamaker_DIR := $(call gb_CustomTarget_get_workdir,touch) $(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) $(call gb_UnoApiTarget_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) | $(touch_javamaker_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) $(call gb_Helper_abbreviate_dirs, \ rm -r $(touch_javamaker_DIR) && \ - $(call gb_Helper_execute,javamaker -nD -O$(touch_javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@) + $(call gb_Helper_execute,javamaker -nD -O$(touch_javamaker_DIR)/class -X$(call gb_UnoApiTarget_get_target,udkapi) $<) && touch $@) # vim: set noet sw=4 ts=4: |