summaryrefslogtreecommitdiff
path: root/xmlsecurity
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 /xmlsecurity
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 'xmlsecurity')
-rw-r--r--xmlsecurity/CppunitTest_qa_certext.mk4
-rw-r--r--xmlsecurity/Library_xmlsecurity.mk4
-rw-r--r--xmlsecurity/Library_xsec_fw.mk4
-rw-r--r--xmlsecurity/Library_xsec_xmlsec.mk18
4 files changed, 15 insertions, 15 deletions
diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk
index a4e1a8f354fc..7fd7af10deb3 100644
--- a/xmlsecurity/CppunitTest_qa_certext.mk
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_CppunitTest_set_include,xmlsecurity_qa_certext,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_add_api,xmlsecurity_qa_certext,\
+$(eval $(call gb_CppunitTest_use_api,xmlsecurity_qa_certext,\
offapi \
udkapi \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,xmlsecurity_qa_certext,\
+$(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\
cppu \
neon \
sal \
diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk
index dbe578b82e27..ad8c0971910f 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,xmlsecurity,\
-I$(SRCDIR)/xmlsecurity/inc \
))
-$(eval $(call gb_Library_add_api,xmlsecurity,\
+$(eval $(call gb_Library_use_api,xmlsecurity,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,xmlsecurity,\
+$(eval $(call gb_Library_use_libraries,xmlsecurity,\
comphelper \
cppu \
cppuhelper \
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
index 6020866a6fae..74a55d14adbd 100644
--- a/xmlsecurity/Library_xsec_fw.mk
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,xsec_fw,\
-I$(SRCDIR)/xmlsecurity/inc \
))
-$(eval $(call gb_Library_add_api,xsec_fw,\
+$(eval $(call gb_Library_use_api,xsec_fw,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,xsec_fw,\
+$(eval $(call gb_Library_use_libraries,xsec_fw,\
cppu \
cppuhelper \
sal \
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index cafde20b9812..915acab22a7d 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\
-I$(SRCDIR)/xmlsecurity/source/xmlsec \
))
-$(eval $(call gb_Library_add_api,xsec_xmlsec,\
+$(eval $(call gb_Library_use_api,xsec_xmlsec,\
udkapi \
offapi \
))
@@ -50,17 +50,17 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
xmlsec1 \
))
else
-$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\
xmlsec1 \
))
endif
-$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
comphelper \
cppu \
cppuhelper \
@@ -98,11 +98,11 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_MSCRYPTO \
))
-$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
xmlsec1-mscrypto \
))
-$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
crypt32 \
advapi32 \
))
@@ -124,7 +124,7 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-DXMLSEC_CRYPTO_NSS \
))
-$(eval $(call gb_Library_add_linked_static_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_static_libraries,xsec_xmlsec,\
xmlsec1-nss \
))
@@ -168,7 +168,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\
-I$(OUTDIR)/inc/mozilla/nss \
))
-$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
nspr4 \
nss3 \
))
@@ -176,7 +176,7 @@ $(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
endif # ifeq ($(SYSTEM_NSS),YES)
ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_add_linked_libs,xsec_xmlsec,\
+$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
dl \
))
endif