summaryrefslogtreecommitdiff
path: root/unoxml
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 /unoxml
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 'unoxml')
-rw-r--r--unoxml/JunitTest_unordf_complex.mk2
-rw-r--r--unoxml/JunitTest_unoxml_complex.mk2
-rw-r--r--unoxml/Library_unordf.mk4
-rw-r--r--unoxml/Library_unoxml.mk4
4 files changed, 6 insertions, 6 deletions
diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk
index bd0c12fa2e41..7d2f47b22b4d 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,unordf_complex,\
+$(eval $(call gb_JunitTest_use_jars,unordf_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk
index 5a5cd4ffa8e0..3f1f679ecda4 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,unoxml_complex,\
+$(eval $(call gb_JunitTest_use_jars,unoxml_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index cb21c0674fe6..a14ec7846007 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,unordf,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,unordf,\
+$(eval $(call gb_Library_use_api,unordf,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,unordf,\
+$(eval $(call gb_Library_use_libraries,unordf,\
comphelper \
cppuhelper \
cppu \
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 8014bace26cb..b744d00eaab5 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,unoxml,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,unoxml,\
+$(eval $(call gb_Library_use_api,unoxml,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,unoxml,\
+$(eval $(call gb_Library_use_libraries,unoxml,\
ucbhelper \
sax \
comphelper \