summaryrefslogtreecommitdiff
path: root/chart2
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 /chart2
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 'chart2')
-rw-r--r--chart2/JunitTest_chart2_unoapi.mk2
-rw-r--r--chart2/Library_chartcontroller.mk4
-rw-r--r--chart2/Library_chartmodel.mk4
-rw-r--r--chart2/Library_charttools.mk4
-rw-r--r--chart2/Library_chartview.mk4
5 files changed, 9 insertions, 9 deletions
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
index ad0315aaed81..575c51f6d831 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/chart2/qa/unoapi/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,chart2_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,chart2_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index d3b0f15769f5..ea0b2c28301c 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
-I$(SRCDIR)/chart2/source/inc \
))
-$(eval $(call gb_Library_add_api,chartcontroller,\
+$(eval $(call gb_Library_use_api,chartcontroller,\
offapi \
udkapi \
))
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartcontroller,\
# CFLAGS+=-ftemplate-depth-128
# .ENDIF
-$(eval $(call gb_Library_add_linked_libs,chartcontroller,\
+$(eval $(call gb_Library_use_libraries,chartcontroller,\
basegfx \
charttools \
chartview \
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index c1de660620f5..c1da053d8485 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartmodel,\
-I$(SRCDIR)/chart2/source/inc \
))
-$(eval $(call gb_Library_add_api,chartmodel,\
+$(eval $(call gb_Library_use_api,chartmodel,\
offapi \
udkapi \
))
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartmodel,\
# CFLAGS+=-ftemplate-depth-128
# .ENDIF
-$(eval $(call gb_Library_add_linked_libs,chartmodel,\
+$(eval $(call gb_Library_use_libraries,chartmodel,\
charttools \
comphelper \
cppu \
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 7b2de1ee1b0f..0c55770f306e 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_add_defs,charttools,\
-DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
))
-$(eval $(call gb_Library_add_api,charttools,\
+$(eval $(call gb_Library_use_api,charttools,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,charttools,\
+$(eval $(call gb_Library_use_libraries,charttools,\
basegfx \
comphelper \
cppu \
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 974df61b1401..ab3952e1d7af 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,chartview,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
-$(eval $(call gb_Library_add_api,chartview,\
+$(eval $(call gb_Library_use_api,chartview,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,chartview,\
+$(eval $(call gb_Library_use_libraries,chartview,\
basegfx \
charttools \
comphelper \