summaryrefslogtreecommitdiff
path: root/ridljar
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-04-07 23:22:08 +0200
committerMichael Stahl <mstahl@redhat.com>2012-04-08 01:05:52 +0200
commitc923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch)
tree4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /ridljar
parenta16060116346533923c607bd406d3fea511b41ec (diff)
gbuild: "use" vs. "add":
Naming convention for gbuild methods: - "add" is used for stuff that is logically a part of the target (i.e. not registered at the Module, but defined in the target's makefile) - "use" is used for stuff that is logically a different target (i.e. it is registered at the Module, has it's own makefile, may be in a different module than the target)
Diffstat (limited to 'ridljar')
-rw-r--r--ridljar/Jar_ridl.mk4
-rw-r--r--ridljar/JunitTest_typedesc.mk2
-rw-r--r--ridljar/JunitTest_uno.mk2
-rw-r--r--ridljar/JunitTest_util.mk2
4 files changed, 5 insertions, 5 deletions
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index 0dacfc36a7fd..e2452251c9e7 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -27,11 +27,11 @@
$(eval $(call gb_Jar_Jar,ridl))
-$(eval $(call gb_Jar_add_customtarget_dependencies,ridl,\
+$(eval $(call gb_Jar_use_customtargets,ridl,\
ridljar/javamaker \
))
-$(eval $(call gb_Jar_add_jars,ridl,\
+$(eval $(call gb_Jar_use_jars,ridl,\
$(WORKDIR)/CustomTarget/ridljar/javamaker/class \
))
diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk
index 8b2afd0d16d3..baa8cdaa4ca3 100644
--- a/ridljar/JunitTest_typedesc.mk
+++ b/ridljar/JunitTest_typedesc.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_typedesc))
-$(eval $(call gb_JunitTest_add_jars,ridljar_typedesc,\
+$(eval $(call gb_JunitTest_use_jars,ridljar_typedesc,\
$(OUTDIR)/bin/ridl.jar \
))
diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk
index 692b3445a7e3..7bbfab9bfdd5 100644
--- a/ridljar/JunitTest_uno.mk
+++ b/ridljar/JunitTest_uno.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_uno))
-$(eval $(call gb_JunitTest_add_jars,ridljar_uno,\
+$(eval $(call gb_JunitTest_use_jars,ridljar_uno,\
$(OUTDIR)/bin/ridl.jar \
))
diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
index 6c23ae245d57..4d27458a1cc0 100644
--- a/ridljar/JunitTest_util.mk
+++ b/ridljar/JunitTest_util.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_JunitTest_JunitTest,ridljar_util))
-$(eval $(call gb_JunitTest_add_jars,ridljar_util,\
+$(eval $(call gb_JunitTest_use_jars,ridljar_util,\
$(OUTDIR)/bin/OOoRunnerLight.jar \
$(OUTDIR)/bin/ridl.jar \
))