summaryrefslogtreecommitdiff
path: root/jurt
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 /jurt
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 'jurt')
-rw-r--r--jurt/CustomTarget_test_urp.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index 01bf397fba57..ce2fa371e89c 100644
--- a/jurt/CustomTarget_test_urp.mk
+++ b/jurt/CustomTarget_test_urp.mk
@@ -15,11 +15,12 @@ $(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp)
$(jurt_TESTURP)/done : \
$(call gb_UnoApiTarget_get_target,test_urp) \
- $(OUTDIR)/bin/udkapi.rdb \
+ $(call gb_UnoApi_get_target,udkapi) \
$(call gb_Executable_get_runtime_dependencies,javamaker)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
rm -rf $(jurt_TESTURP) && \
- $(call gb_Helper_execute,javamaker -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/udkapi.rdb) && \
+ $(call gb_Helper_execute,javamaker -O$(jurt_TESTURP) -nD $< \
+ -X$(call gb_UnoApi_get_target,udkapi)) && \
touch $@
# vim:set shiftwidth=4 tabstop=4 noexpandtab: