summaryrefslogtreecommitdiff
path: root/starmath
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 /starmath
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 'starmath')
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk14
-rw-r--r--starmath/JunitTest_sm_unoapi.mk2
-rw-r--r--starmath/JunitTest_starmath_unoapi.mk2
-rw-r--r--starmath/Library_sm.mk4
-rw-r--r--starmath/Library_smd.mk4
5 files changed, 13 insertions, 13 deletions
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index c33a99e28000..fd65302353d2 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\
-I$(SRCDIR)/starmath/inc \
))
-$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\
offapi \
udkapi \
))
@@ -42,13 +42,13 @@ $(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\
-DSMDLL \
))
-$(eval $(call gb_CppunitTest_add_library_objects,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_library_objects,starmath_qa_cppunit,\
sm \
))
$(call gb_CxxObject_get_target,starmath/qa/cppunit/test_starmath): $(WORKDIR)/AllLangRes/sm
-$(eval $(call gb_CppunitTest_add_linked_libs,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\
comphelper \
cppu \
cppuhelper \
@@ -77,11 +77,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\
$(eval $(call gb_CppunitTest_uses_ure,starmath_qa_cppunit))
-$(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,starmath_qa_cppunit,\
types \
))
-$(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_components,starmath_qa_cppunit,\
configmgr/source/configmgr \
framework/util/fwk \
i18npool/util/i18npool \
@@ -89,13 +89,13 @@ $(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\
sfx2/util/sfx \
))
-$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\
component/vcl/vcl \
mcnttype \
))
ifeq ($(strip $(OS)),WNT)
-$(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\
+$(eval $(call gb_CppunitTest_use_old_components,starmath_qa_cppunit,\
ftransl \
sysdtrans \
))
diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk
index c70699f44a8f..b021c50d77a4 100644
--- a/starmath/JunitTest_sm_unoapi.mk
+++ b/starmath/JunitTest_sm_unoapi.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_JunitTest_set_defs,sm_unoapi,\
-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \
))
-$(eval $(call gb_JunitTest_add_jars,sm_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,sm_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk
index a59c6669ff1a..13194ad92ab2 100644
--- a/starmath/JunitTest_starmath_unoapi.mk
+++ b/starmath/JunitTest_starmath_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/starmath/qa/unoapi/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,starmath_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,starmath_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 891a07377a1e..bd13669c33c8 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,sm,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,sm,\
+$(eval $(call gb_Library_use_api,sm,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,sm,\
+$(eval $(call gb_Library_use_libraries,sm,\
comphelper \
cppu \
cppuhelper \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 12b035f1b20c..3e36ddf85179 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,smd,\
-I$(SRCDIR)/starmath/inc \
))
-$(eval $(call gb_Library_add_api,smd,\
+$(eval $(call gb_Library_use_api,smd,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,smd,\
+$(eval $(call gb_Library_use_libraries,smd,\
cppu \
cppuhelper \
sal \