diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-19 16:40:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-19 16:48:30 +0100 |
| commit | ea64122c013f0b6c9fc862eeba81b154901ae6ab (patch) | |
| tree | 02dd2f88d30166a9b3f11da8a91f34bf0f7fde22 /xmlsecurity | |
| parent | 7615f62b81be351daba463d79598abe5665e0adf (diff) | |
Further SYSTEM_MOZILLA/SYSTEM_NSS clean-up
...past 8648c974ea5e222027a5ac1c9a01cd9ac6e344a8 "Clean-up 'SYSTEM_MOZILLA' ->
'SYSTEM_NSS.'" Looks like -DSYSTEM_MOZILLA in RepositoryExternal.mk's
gb_LinkTarget__use_nss3 was only relevant for
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (for which it had been set
explicitly in xmlsecurity/Library_xsec_xmlsec.mk, and renamed to SYSTEM_NSS
already). And looks like xmlsecurity/Library_xsec_xmlsec.mk's explicit
SYSTEM_NSS code was more or less a duplication of RepositoryExternal.mk's
gb_LinkTarget__use_nss3, so made that DRY.
Change-Id: Ie6eca2c4eb7fb70f6a36c97d8681b4140f9870cb
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/Library_xsec_xmlsec.mk | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 6808cbc21f1a..29010b709071 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ + nss3 \ )) $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ @@ -148,36 +149,6 @@ $(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\ endif # ifeq ($(GUI)$(CROSS_COMPILING),WNT) -ifeq ($(SYSTEM_NSS),YES) - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - $(NSS_CFLAGS) \ -)) - -$(eval $(call gb_Library_add_defs,xsec_xmlsec,\ - -DSYSTEM_NSS \ -)) - -$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(NSS_LIBS) \ -)) - -else - -$(eval $(call gb_Library_set_include,xsec_xmlsec,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/nspr \ - -I$(OUTDIR)/inc/mozilla/nss \ -)) - -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - nspr4 \ - nss3 \ -)) - -endif # ifeq ($(SYSTEM_NSS),YES) - ifeq ($(OS),SOLARIS) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ -ldl \ |