diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /xmlsecurity/Library_xsec_xmlsec.mk | |
parent | a16060116346533923c607bd406d3fea511b41ec (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/Library_xsec_xmlsec.mk')
-rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 18 |
1 files changed, 9 insertions, 9 deletions
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 |