[Libreoffice-commits] core.git: embedserv/Module_embedserv.mk sw/CppunitTest_sw_ww8export.mk

[Niklas Johansson]

 embedserv/Module_embedserv.mk  |    2 +-
 sw/CppunitTest_sw_ww8export.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 907445612298aae4f3322a7d9cdc6871d54ba47a
Author: Niklas Johansson <sleeping.pillow at gmail.com>
Date:   Sun Sep 1 16:06:57 2013 +0200

    Make it possible to build without ATL
    
    Change-Id: I381934bc00273da7bf359610bb471ec4cbc49545
    Reviewed-on: https://gerrit.libreoffice.org/5740
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/embedserv/Module_embedserv.mk b/embedserv/Module_embedserv.mk
index 009d63e..fc11190 100644
--- a/embedserv/Module_embedserv.mk
+++ b/embedserv/Module_embedserv.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_Module,embedserv))
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,embedserv,\
-	Library_inprocserv \
+	$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,Library_inprocserv) \
 ))
 
 ifeq ($(DISABLE_ATL),)
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index c75d929..2b1a475 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export, \
     comphelper \
     cppu \
     cppuhelper \
-    emboleobj \
+    $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
     sal \
     test \
     unotest \