summaryrefslogtreecommitdiff
path: root/svx
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 /svx
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 'svx')
-rw-r--r--svx/Executable_gengal.bin.mk8
-rw-r--r--svx/JunitTest_svx_unoapi.mk2
-rw-r--r--svx/Library_svx.mk6
-rw-r--r--svx/Library_svxcore.mk4
-rw-r--r--svx/Library_textconversiondlgs.mk4
5 files changed, 12 insertions, 12 deletions
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index dbd78183d380..61fe0505a9f3 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\
$$(CXXFLAGS) \
))
-$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
+$(eval $(call gb_Executable_use_libraries,$(gengalbin),\
sal \
tl \
svl \
@@ -65,12 +65,12 @@ $(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\
svx/source/gengal/gengal \
))
-$(eval $(call gb_Executable_add_linked_static_libs,$(gengalbin),\
+$(eval $(call gb_Executable_use_static_libraries,$(gengalbin),\
vclmain \
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
+$(eval $(call gb_Executable_use_libraries,$(gengalbin),\
kernel32 \
msvcrt \
$(gb_Library_win32_OLDNAMES) \
@@ -80,7 +80,7 @@ $(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
+$(eval $(call gb_Executable_use_libraries,$(gengalbin),\
dl \
pthread \
))
diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk
index 5fa78c0a0d68..9266f9ede569 100644
--- a/svx/JunitTest_svx_unoapi.mk
+++ b/svx/JunitTest_svx_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svx/qa/unoapi/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,svx_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,svx_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 2e3e4d80fb79..ba8ffa181b61 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,svx,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,svx,\
+$(eval $(call gb_Library_use_api,svx,\
udkapi \
offapi \
))
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,svx,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
-$(eval $(call gb_Library_add_linked_libs,svx,\
+$(eval $(call gb_Library_use_libraries,svx,\
basegfx \
sb \
comphelper \
@@ -224,7 +224,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
))
else
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,svx,\
+$(eval $(call gb_Library_use_libraries,svx,\
advapi32 \
))
$(eval $(call gb_Library_add_exception_objects,svx,\
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 38145872f016..c1565f10202c 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_add_package_headers,svxcore,\
svx_sdi \
))
-$(eval $(call gb_Library_add_api,svxcore,\
+$(eval $(call gb_Library_use_api,svxcore,\
udkapi \
offapi \
))
@@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_defs,svxcore,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
-$(eval $(call gb_Library_add_linked_libs,svxcore,\
+$(eval $(call gb_Library_use_libraries,svxcore,\
avmedia \
basegfx \
sb \
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index c235c15dfe54..70ba60699ac9 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,textconversiondlgs,\
+$(eval $(call gb_Library_use_api,textconversiondlgs,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
+$(eval $(call gb_Library_use_libraries,textconversiondlgs,\
comphelper \
cppuhelper \
cppu \