diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-03-14 11:59:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-03-14 21:41:26 +0000 |
| commit | e597ef0489d9d5504721d21eefa15c65da0fb240 (patch) | |
| tree | 7c9e6e1034830b909c155568f17ecb80c9a41322 /Repository.mk | |
| parent | 3fa34da687ba4be98319888a90cba6414b9f3fbe (diff) | |
No need for --disable-activex and --disable-atl any longer
Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b
Reviewed-on: https://gerrit.libreoffice.org/35174
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/Repository.mk b/Repository.mk index 322650aa182b..391d8bb2fd0f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -346,7 +346,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \ drawinglayer \ editeng \ - $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \ + $(if $(filter WNT,$(OS)),emser) \ evtatt \ expwrap \ $(call gb_Helper_optional,DBCONNECTIVITY, \ @@ -456,7 +456,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ mozbootstrap \ $(if $(filter $(OS),WNT), \ ado \ - $(if $(DISABLE_ATL),,oleautobridge) \ + oleautobridge \ smplmail \ wininetbe1 \ ) \ @@ -604,7 +604,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(ENABLE_JAVA), \ $(if $(filter $(OS),MACOSX),,officebean) \ ) \ - $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ + emboleobj \ package2 \ $(if $(USING_X11),recentfile) \ $(call gb_Helper_optional,SCRIPTING,scriptframe) \ @@ -636,11 +636,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ dtrans \ fps \ ftransl \ - $(if $(DISABLE_ATL),,\ - inprocserv \ - UAccCOM \ - winaccessibility \ - ) \ + inprocserv \ + UAccCOM \ + winaccessibility \ ) \ )) @@ -652,24 +650,18 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \ - $(if $(DISABLE_ACTIVEX),,\ - regactivex \ - ) \ + regactivex \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \ - $(if $(DISABLE_ACTIVEX),,\ - so_activex \ - spsupp \ - ) \ + so_activex \ + spsupp \ )) ifneq ($(BUILD_X64),) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \ - $(if $(DISABLE_ACTIVEX),,\ - so_activex_x64 \ - spsupp_x64 \ - ) \ + so_activex_x64 \ + spsupp_x64 \ )) endif |