summaryrefslogtreecommitdiff
path: root/unoil
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-25 16:45:41 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-25 16:46:55 +0200
commit5b29d3a7fd759fd3d35af4a13e0977be6c20cd99 (patch)
treecb43d76a9eb69bd59356cf4385fdfeadcb99795d /unoil
parent7d97ec9a3eba9ceacbea631a56185e40b62fdec7 (diff)
gbuild: refactor UnoApi to remove rdb files from OUTDIR
- gb_UnoApi_get_target returns the files in INSTDIR - stop using rdb files from OUTDIR - remove gb_UnoApi_install - remove pointless 2nd parameter of gb_UnoApi_UnoApi - order-only dependency from gb_UnoApi_get_target to gb_UnoApiHeadersTarget_get_target because INSTDIR .rdb is always outdated Change-Id: Id418f75e9b38d6fe135b55eca2594c2624bc41cc
Diffstat (limited to 'unoil')
-rw-r--r--unoil/CustomTarget_javamaker.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk
index 7ec9ec6bfbc1..9c4d07405b8d 100644
--- a/unoil/CustomTarget_javamaker.mk
+++ b/unoil/CustomTarget_javamaker.mk
@@ -13,13 +13,17 @@ unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
$(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done
-$(unoil_JAVADIR)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
+$(unoil_JAVADIR)/done : \
+ $(call gb_UnoApi_get_target,offapi) \
+ $(call gb_UnoApi_get_target,udkapi) \
$(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(unoil_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
rm -r $(unoil_JAVADIR) && \
- $(call gb_Helper_execute,javamaker -O$(unoil_JAVADIR) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
+ $(call gb_Helper_execute,javamaker -O$(unoil_JAVADIR) \
+ $(call gb_UnoApi_get_target,offapi) \
+ -X$(call gb_UnoApi_get_target,udkapi)) && \
touch $@)
# vim:set shiftwidth=4 tabstop=4 noexpandtab: