From c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Sat, 7 Apr 2012 23:22:08 +0200
Subject: 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)
---
 jurt/Jar_jurt.mk                | 2 +-
 jurt/JunitTest_bridgefactory.mk | 4 ++--
 jurt/JunitTest_connections.mk   | 4 ++--
 jurt/JunitTest_java.mk          | 4 ++--
 jurt/JunitTest_java_remote.mk   | 4 ++--
 jurt/JunitTest_remote.mk        | 4 ++--
 jurt/JunitTest_uno.mk           | 4 ++--
 jurt/JunitTest_urp.mk           | 6 +++---
 jurt/JunitTest_util.mk          | 4 ++--
 jurt/Library_jpipe.mk           | 4 ++--
 jurt/Library_jpipx.mk           | 2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'jurt')

diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index 4cd6bb80dbd1..9fbabec3c016 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Jar_Jar,jurt))
 
-$(eval $(call gb_Jar_add_jars,jurt,\
+$(eval $(call gb_Jar_use_jars,jurt,\
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/unoloader.jar \
 ))
diff --git a/jurt/JunitTest_bridgefactory.mk b/jurt/JunitTest_bridgefactory.mk
index 28272cfae836..b5211a3273d7 100644
--- a/jurt/JunitTest_bridgefactory.mk
+++ b/jurt/JunitTest_bridgefactory.mk
@@ -27,11 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_bridgefactory))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_bridgefactory,\
+$(eval $(call gb_JunitTest_use_jars,jurt_bridgefactory,\
     $(OUTDIR)/bin/ridl.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_bridgefactory,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_bridgefactory,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_bridgefactory,\
     jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test \
diff --git a/jurt/JunitTest_connections.mk b/jurt/JunitTest_connections.mk
index 1b21302245a5..e5f1c6a5e0a9 100644
--- a/jurt/JunitTest_connections.mk
+++ b/jurt/JunitTest_connections.mk
@@ -27,11 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_connections))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_connections,\
+$(eval $(call gb_JunitTest_use_jars,jurt_connections,\
     $(OUTDIR)/bin/ridl.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_connections,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_connections,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_connections,\
     jurt/test/com/sun/star/comp/connections/PipedConnection_Test \
diff --git a/jurt/JunitTest_java.mk b/jurt/JunitTest_java.mk
index 960144e083eb..a9cc19009b04 100644
--- a/jurt/JunitTest_java.mk
+++ b/jurt/JunitTest_java.mk
@@ -27,11 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_java))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_java,\
+$(eval $(call gb_JunitTest_use_jars,jurt_java,\
     $(OUTDIR)/bin/ridl.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_java,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_java,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_java,\
     jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test \
diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk
index 0e5190c80428..9a103af1651a 100644
--- a/jurt/JunitTest_java_remote.mk
+++ b/jurt/JunitTest_java_remote.mk
@@ -27,12 +27,12 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_java_remote))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_java_remote,\
+$(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\
 	$(OUTDIR)/bin/OOoRunnerLight.jar \
     $(OUTDIR)/bin/ridl.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_java_remote,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_java_remote,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_java_remote,\
     jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test \
diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk
index 37e4cd13bc9e..0267930e768e 100644
--- a/jurt/JunitTest_remote.mk
+++ b/jurt/JunitTest_remote.mk
@@ -27,11 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_remote))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_remote,\
+$(eval $(call gb_JunitTest_use_jars,jurt_remote,\
     $(OUTDIR)/bin/ridl.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_remote,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_remote,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_remote,\
     jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test \
diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk
index 52223dda270c..5c4303ba2e26 100644
--- a/jurt/JunitTest_uno.mk
+++ b/jurt/JunitTest_uno.mk
@@ -27,12 +27,12 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_uno))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_uno,\
+$(eval $(call gb_JunitTest_use_jars,jurt_uno,\
     $(OUTDIR)/bin/OOoRunnerLight.jar \
     $(OUTDIR)/bin/ridl.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_uno,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_uno,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_uno,\
     jurt/test/com/sun/star/uno/AnyConverter_Test \
diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk
index a4ef41004021..21739c6644fc 100644
--- a/jurt/JunitTest_urp.mk
+++ b/jurt/JunitTest_urp.mk
@@ -27,16 +27,16 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_urp))
 
-$(eval $(call gb_JunitTest_add_customtarget_dependencies,jurt_urp,\
+$(eval $(call gb_JunitTest_use_customtargets,jurt_urp,\
     jurt/test/com/sun/star/lib/uno/protocols/urp \
 ))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_urp,\
+$(eval $(call gb_JunitTest_use_jars,jurt_urp,\
     $(OUTDIR)/bin/ridl.jar \
     $(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_urp,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_urp,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_urp,\
     jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \
diff --git a/jurt/JunitTest_util.mk b/jurt/JunitTest_util.mk
index 278e5ba13cfd..206903648a53 100644
--- a/jurt/JunitTest_util.mk
+++ b/jurt/JunitTest_util.mk
@@ -27,11 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,jurt_util))
 
-$(eval $(call gb_JunitTest_add_jars,jurt_util,\
+$(eval $(call gb_JunitTest_use_jars,jurt_util,\
     $(OUTDIR)/bin/ridl.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_jar_classset,jurt_util,jurt))
+$(eval $(call gb_JunitTest_use_jar_classset,jurt_util,jurt))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,jurt_util,\
     jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test \
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 4a8dfe5fdc0b..16707557f8f7 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,jpipe))
 
-$(eval $(call gb_Library_add_linked_libs,jpipe,\
+$(eval $(call gb_Library_use_libraries,jpipe,\
     $(gb_STDLIBS) \
 ))
 
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\
 
 else
 
-$(eval $(call gb_Library_add_linked_libs,jpipe,\
+$(eval $(call gb_Library_use_libraries,jpipe,\
     sal \
 ))
 
diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk
index 20579f83fb13..21087c2d291f 100644
--- a/jurt/Library_jpipx.mk
+++ b/jurt/Library_jpipx.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,jpipx))
 
-$(eval $(call gb_Library_add_linked_libs,jpipx,\
+$(eval $(call gb_Library_use_libraries,jpipx,\
     sal \
     $(gb_STDLIBS) \
 ))
-- 
cgit