[Libreoffice-commits] .: 2 commits - Makefile.in xml2cmp/Executable_xml2cmp.mk

[Bjoern Michaelsen]

 Makefile.in                   |    2 +-
 xml2cmp/Executable_xml2cmp.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a9fd548c242eeaf88a1d583fef3ac69947068f7
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Sep 16 14:28:32 2011 +0200

    better filter-out uwinapi (in case gb_STDLIBS changes)

diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk
index 5387a8c..40e8428 100644
--- a/xml2cmp/Executable_xml2cmp.mk
+++ b/xml2cmp/Executable_xml2cmp.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\
 #which depends on this module.
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
-    advapi32 \
+    $(filter-out uwinapi,$(gb_STDLIBS)) \
 ))
 else
 $(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
commit 0858e1b98a13bc7917293ccf7e3c0ec0ae32b4dc
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Sep 13 12:49:40 2011 +0200

    make check target depend build-order-only on dev-install to allow 'make all dev-install check'

diff --git a/Makefile.in b/Makefile.in
index fde29e4..eb15908 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,7 @@ fetch: src.downloaded
 Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
 	./autogen.sh
 
-check: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ fetch
+check: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ fetch | dev-install
 	@. ./Env.Host.sh && \
 	cd smoketestoo_native && \
         build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@