diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-18 14:12:08 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-09-25 07:25:46 +0000 |
| commit | c29ea22b899f24dab3eecce9df8c70544f044e1b (patch) | |
| tree | 83c000b95f9863a938facc96b75d7e65e7e2b127 /Repository.mk | |
| parent | edb9ef41f29bf3477b8985ee409ce2d22214e63f (diff) | |
Replace GUIBASE with USING_X11
That's what it actually means. Also make it a boolean
Change-Id: I249e18351253b34b5dada28e2a9c6bc0c06b730c
Reviewed-on: https://gerrit.libreoffice.org/18688
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Repository.mk b/Repository.mk index 9a7c31de28e9..7e39aab690c1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -145,8 +145,8 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ gengal \ - $(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \ - $(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \ + $(if $(filter TRUE-TRUE,$(USING_X11)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \ + $(if $(ENABLE_TDE),tdefilepicker) \ $(if $(filter WNT,$(OS)),,uri-encode) \ ui-previewer \ $(if $(filter WNT,$(OS)), \ @@ -166,7 +166,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,python, \ ) \ )) -ifeq ($(GUIBASE),unx) +ifeq ($(USING_X11), TRUE) $(eval $(call gb_Helper_register_executables_for_install,OOO,gnome, \ $(if $(ENABLE_GTK),\ xid-fullscreen-on-all-monitors \ @@ -252,7 +252,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \ $(if $(ENABLE_KDE4),kde4be1) \ - $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ + $(if $(USING_X11), \ $(if $(ENABLE_KDE4),vclplug_kde4) \ ) \ )) @@ -302,7 +302,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ dbaxml) \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ - $(if $(filter unx,$(GUIBASE)),desktop_detector) \ + $(if $(USING_X11),desktop_detector) \ $(call gb_Helper_optional,SCRIPTING,dlgprov) \ $(if $(ENABLE_DIRECTX),directx9canvas) \ $(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \ @@ -424,7 +424,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ) \ vcl \ vclcanvas \ - $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ + $(if $(USING_X11), \ vclplug_gen \ $(if $(ENABLE_TDE),vclplug_tde) \ ) \ @@ -589,7 +589,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ package2 \ - $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),recentfile) \ + $(if $(USING_X11),recentfile) \ $(call gb_Helper_optional,SCRIPTING,scriptframe) \ sdbc2 \ sofficeapp \ @@ -854,7 +854,7 @@ $(eval $(call gb_Helper_register_packages_for_install,xsltfilter,\ filter_xslt \ )) -ifeq ($(GUIBASE),unx) +ifeq ($(USING_X11), TRUE) $(eval $(call gb_Helper_register_packages_for_install,base_brand,\ desktop_sbase_sh \ )) @@ -878,7 +878,7 @@ $(eval $(call gb_Helper_register_packages_for_install,math_brand,\ $(eval $(call gb_Helper_register_packages_for_install,writer_brand,\ desktop_swriter_sh \ )) -endif # GUIBASE=unx +endif # USING_X11=TRUE ifneq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_Helper_register_packages_for_install,python, \ |