strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up dead uses of DISABLE_ATL

Browse source 
...after e597ef0489 "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>
This commit is contained in:
Stephan Bergmann 2019-01-24 14:46:32 +01:00
parent 938012a9f4
commit df984a465c
9 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
basic/CppunitTest_basic_macros.mk
View file

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

2
embeddedobj/Module_embeddedobj.mk
View file

@ -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:

7
embedserv/Module_embedserv.mk
View file

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

12
postprocess/Rdb_services.mk
View file

@ -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 \

2
sw/CppunitTest_sw_ww8export.mk
View file

@ -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 \

2
sw/CppunitTest_sw_ww8export2.mk
View file

@ -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 \

2
sw/CppunitTest_sw_ww8export3.mk
View file

@ -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 \

4
sw/ooxmlexport_setup.mk
View file

@ -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 \

2
winaccessibility/Module_winaccessibility.mk
View file

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