diff options
| -rw-r--r-- | basic/CppunitTest_basic_macros.mk | 4 | ||||
| -rw-r--r-- | embeddedobj/Module_embeddedobj.mk | 2 | ||||
| -rw-r--r-- | embedserv/Module_embedserv.mk | 7 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 12 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_ww8export.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_ww8export2.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_ww8export3.mk | 2 | ||||
| -rw-r--r-- | sw/ooxmlexport_setup.mk | 4 | ||||
| -rw-r--r-- | winaccessibility/Module_winaccessibility.mk | 2 |
9 files changed, 13 insertions, 24 deletions
diff --git a/basic/CppunitTest_basic_macros.mk b/basic/CppunitTest_basic_macros.mk index 2ce70764e294..e86c3dae27e4 100644 --- a/basic/CppunitTest_basic_macros.mk +++ b/basic/CppunitTest_basic_macros.mk @@ -61,8 +61,8 @@ $(eval $(call gb_CppunitTest_use_components,basic_macros,\ i18npool/util/i18npool \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ - $(if $(DISABLE_ATL),,$(if $(filter $(OS),WNT), \ - extensions/source/ole/oleautobridge)) \ + $(if $(filter $(OS),WNT), \ + extensions/source/ole/oleautobridge) \ )) $(eval $(call gb_CppunitTest_use_configuration,basic_macros)) diff --git a/embeddedobj/Module_embeddedobj.mk b/embeddedobj/Module_embeddedobj.mk index 68b38e80e909..f344565192f6 100644 --- a/embeddedobj/Module_embeddedobj.mk +++ b/embeddedobj/Module_embeddedobj.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,embeddedobj)) $(eval $(call gb_Module_add_targets,embeddedobj,\ Library_embobj \ - $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,Library_emboleobj) \ + Library_emboleobj \ )) # vim: set noet sw=4 ts=4: diff --git a/embedserv/Module_embedserv.mk b/embedserv/Module_embedserv.mk index fc1119012473..505efa5c4494 100644 --- a/embedserv/Module_embedserv.mk +++ b/embedserv/Module_embedserv.mk @@ -13,14 +13,9 @@ $(eval $(call gb_Module_Module,embedserv)) ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,embedserv,\ - $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,Library_inprocserv) \ -)) - -ifeq ($(DISABLE_ATL),) -$(eval $(call gb_Module_add_targets,embedserv,\ Library_emser \ + Library_inprocserv \ )) -endif endif diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 0e175de547cc..c70d1ca52005 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -154,13 +154,11 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(filter-out WNT,$(OS)), \ embeddedobj/source/msole/emboleobj \ ) \ - $(if $(DISABLE_ATL),, \ - $(if $(filter WNT,$(OS)), \ - embeddedobj/source/msole/emboleobj.windows \ - embedserv/util/emser \ - extensions/source/ole/oleautobridge \ - winaccessibility/source/service/winaccessibility \ - ) \ + $(if $(filter WNT,$(OS)), \ + embeddedobj/source/msole/emboleobj.windows \ + embedserv/util/emser \ + extensions/source/ole/oleautobridge \ + winaccessibility/source/service/winaccessibility \ ) \ $(if $(WITH_WEBDAV), \ ucb/source/ucp/webdav-neon/ucpdav1 \ diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index 4fcf5be03470..548a7bcbad77 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 \ - $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ + emboleobj \ sal \ test \ unotest \ diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk index df8ae2ace998..ff620638cfed 100644 --- a/sw/CppunitTest_sw_ww8export2.mk +++ b/sw/CppunitTest_sw_ww8export2.mk @@ -20,7 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export2, \ cppu \ cppuhelper \ editeng \ - $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ + emboleobj \ sal \ sfx \ test \ diff --git a/sw/CppunitTest_sw_ww8export3.mk b/sw/CppunitTest_sw_ww8export3.mk index 564f344d7297..3ceb6178e698 100644 --- a/sw/CppunitTest_sw_ww8export3.mk +++ b/sw/CppunitTest_sw_ww8export3.mk @@ -20,7 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export3, \ cppu \ cppuhelper \ editeng \ - $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ + emboleobj \ sal \ sfx \ test \ diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index 11fa454fae93..45cf7a6be0e0 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -37,9 +37,7 @@ define sw_ooxmlexport_components embeddedobj/util/embobj \ emfio/emfio \ $(if $(filter WNT,$(OS)), \ - $(if $(DISABLE_ATL),, \ - embeddedobj/source/msole/emboleobj.windows \ - ), \ + embeddedobj/source/msole/emboleobj.windows, \ embeddedobj/source/msole/emboleobj \ ) \ filter/source/config/cache/filterconfig1 \ diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk index 19490a6991f9..2421164b34bd 100644 --- a/winaccessibility/Module_winaccessibility.mk +++ b/winaccessibility/Module_winaccessibility.mk @@ -11,14 +11,12 @@ $(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 |