summaryrefslogtreecommitdiff
path: root/ridljar
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-12-25 10:32:01 +0100
committerDavid Tardon <dtardon@redhat.com>2011-12-25 10:32:01 +0100
commitff9a64e01d7d46a9869327fb89a4adcc674eb433 (patch)
tree37bf9d9a316d2b13a19630b247e761c901c240e1 /ridljar
parent78e56daa46a01f375684bc3d4c5767c6c0a9ac07 (diff)
add dependency on package
Diffstat (limited to 'ridljar')
-rw-r--r--ridljar/Jar_ridl.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index 337c03f49056..b4c60e344291 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_Jar_Jar,ridl))
+$(eval $(call gb_Jar_add_package_dependencies,ridl,\
+ ridljar_javamaker \
+))
+
$(eval $(call gb_Jar_add_jars,ridl,\
$(WORKDIR)/CustomTarget/ridljar/javamaker/class \
))
@@ -66,9 +70,4 @@ $(eval $(call gb_Jar_add_sourcefiles,ridl,\
ridljar/com/sun/star/uno/UnoRuntime \
))
-# gb_Jar_add_jars adds dependency on all "jars", but the .../class dir
-# is created by a custom target, so there is no visible rule for it,
-# which is something make does not like. We add one to satisfy it.
-$(WORKDIR)/CustomTarget/ridljar/javamaker/class :| $(call gb_Package_get_target,ridljar_javamaker)
-
# vim:set shiftwidth=4 softtabstop=4 expandtab: