From 6f6f7a17dc82248446dc4eddfd51af08362fc352 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- xmlsecurity/CppunitTest_qa_certext.mk | 1 + xmlsecurity/Library_xmlsecurity.mk | 1 + xmlsecurity/Library_xsec_fw.mk | 1 + xmlsecurity/Library_xsec_xmlsec.mk | 1 + 4 files changed, 4 insertions(+) (limited to 'xmlsecurity') diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 7fd7af10deb3..7501f23cc110 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ svl \ test \ tl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index aae123bd8c47..09766bc188f4 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ utl \ vcl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 4ea0768b4d51..99b393f532de 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index e2048f60454a..5195db72d41a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ svl \ tl \ xo \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) -- cgit From 816ec4b0933e36ac468230365359c3b9d8d52986 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- xmlsecurity/CppunitTest_qa_certext.mk | 3 ++- xmlsecurity/Library_xmlsecurity.mk | 3 ++- xmlsecurity/Library_xsec_fw.mk | 3 ++- xmlsecurity/Library_xsec_xmlsec.mk | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 7501f23cc110..201b8bf540cb 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ test \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,xmlsecurity_qa_certext)) + $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ xmlsecurity/qa/certext/SanCertExt \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 09766bc188f4..3333e21f5fce 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -52,9 +52,10 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xmlsecurity)) + $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ xmlsecurity/source/component/documentdigitalsignatures \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 99b393f532de..1aea707bcb5e 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_fw)) + $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/decryptorimpl \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 5195db72d41a..41cbfafcaad1 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ tl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,xsec_xmlsec)) + $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ )) -- cgit From 578e195cf3120508422a317cc7fac870ae0a3a7f Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 12:25:50 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris Change-Id: Ia7f64bdd0fd81c5dcc08d828db4602b65e2da949 --- xmlsecurity/Library_xsec_xmlsec.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 41cbfafcaad1..3966e76e4052 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -181,8 +181,8 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ endif # ifeq ($(SYSTEM_NSS),YES) ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ - dl \ +$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ + -ldl \ )) endif -- cgit From 8831c592e80288be39a9e5f4d20e617b55682003 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:31:46 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d --- xmlsecurity/Library_xsec_xmlsec.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 3966e76e4052..27479a3fc63f 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ xmlsec1-mscrypto \ )) -$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ +$(eval $(call gb_Library_use_system_win32_libs,xsec_xmlsec,\ crypt32 \ advapi32 \ )) -- cgit From f011af716e2978cbf9fcb7748dc868c503edddff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- xmlsecurity/CppunitTest_qa_certext.mk | 2 -- xmlsecurity/Library_xmlsecurity.mk | 2 -- xmlsecurity/Library_xsec_fw.mk | 2 -- xmlsecurity/Library_xsec_xmlsec.mk | 2 -- 4 files changed, 8 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk index 201b8bf540cb..c42e02408fd7 100644 --- a/xmlsecurity/CppunitTest_qa_certext.mk +++ b/xmlsecurity/CppunitTest_qa_certext.mk @@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_qa_certext,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,xmlsecurity_qa_certext)) - $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_qa_certext,\ xmlsecurity/qa/certext/SanCertExt \ )) diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk index 3333e21f5fce..097e016aa3af 100644 --- a/xmlsecurity/Library_xmlsecurity.mk +++ b/xmlsecurity/Library_xmlsecurity.mk @@ -54,8 +54,6 @@ $(eval $(call gb_Library_use_libraries,xmlsecurity,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xmlsecurity)) - $(eval $(call gb_Library_add_exception_objects,xmlsecurity,\ xmlsecurity/source/component/certificatecontainer \ xmlsecurity/source/component/documentdigitalsignatures \ diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk index 1aea707bcb5e..24de37ee7c66 100644 --- a/xmlsecurity/Library_xsec_fw.mk +++ b/xmlsecurity/Library_xsec_fw.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,xsec_fw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsec_fw)) - $(eval $(call gb_Library_add_exception_objects,xsec_fw,\ xmlsecurity/source/framework/buffernode \ xmlsecurity/source/framework/decryptorimpl \ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 27479a3fc63f..4eceb305587a 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,xsec_xmlsec)) - $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ libxml2 \ )) -- cgit From 39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 15:19:10 +0200 Subject: translations is a source-only module Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4 --- xmlsecurity/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst index 9dfe04cc5c81..1f9b0a9786cf 100644 --- a/xmlsecurity/prj/build.lst +++ b/xmlsecurity/prj/build.lst @@ -1,2 +1,2 @@ -xs xmlsecurity : TRANSLATIONS:translations xmloff unotools offapi unoil svx libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL +xs xmlsecurity : xmloff unotools offapi unoil svx libxmlsec NSS:nss LIBXSLT:libxslt NEON:neon NULL xs xmlsecurity\prj nmake - all xs_prj NULL -- cgit