[Libreoffice-commits] core.git: postprocess/Rdb_services.mk winaccessibility/Module_winaccessibility.mk

[Isamu Mogi]

 postprocess/Rdb_services.mk                 |    2 +-
 winaccessibility/Module_winaccessibility.mk |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1542a655ea21da4cdcd4b836283e44fba5f35059
Author: Isamu Mogi <saturday6c at gmail.com>
Date:   Wed Dec 18 20:52:45 2013 +0900

    --disable-atl disables winaccessibility
    
    Change-Id: I548ea294e6c632b8ae95e6745a51d9b12c7e5297
    Reviewed-on: https://gerrit.libreoffice.org/7130
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index a49b1dd..7e9568b 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -135,7 +135,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 		shell/source/win32/simplemail/smplmail \
 		shell/source/win32/syssh \
 		vcl/vcl.windows \
-		winaccessibility/source/service/winaccessibility \
 	) \
 	$(if $(ENABLE_HEADLESS), \
 		vcl/vcl.headless \
@@ -148,6 +147,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 			embeddedobj/source/msole/emboleobj.windows \
 			embedserv/util/emser \
 			extensions/source/ole/oleautobridge \
+			winaccessibility/source/service/winaccessibility \
 		) \
 	) \
 	$(if $(DISABLE_NEON),, \
diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk
index 2421164..19490a6 100644
--- a/winaccessibility/Module_winaccessibility.mk
+++ b/winaccessibility/Module_winaccessibility.mk
@@ -11,12 +11,14 @@ $(eval $(call gb_Module_Module,winaccessibility))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),MSC)
+ifeq ($(DISABLE_ATL),)
 $(eval $(call gb_Module_add_targets,winaccessibility,\
 	WinResTarget_uacccom \
 	CustomTarget_ia2_idl \
 	Library_uacccom \
 	Library_winaccessibility \
 ))
+endif # !DISABLE_ATL
 endif # COM=MSC
 endif # WNT