Clean up dead uses of DISABLE_ATL

...after e597ef04 "No need for --disable-activex
and --disable-atl any longer"

Change-Id: I6ea0026fd18e0097aaaf0c1b05618e2a9ddf1a94
Reviewed-on: https://gerrit.libreoffice.org/66871
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

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))
 

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:

embedserv/Module_embedserv.mk

@@ -12,15 +12,10 @@ $(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
 

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 \

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 \

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 \

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 \

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 \

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