From c29098917a1118d4b435df2b5f542adc8505e123 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Wed, 12 Dec 2012 01:07:09 +0200
Subject: Get rid of (most uses of) GUI

GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
---
 lpsolve/ExternalPackage_lpsolve.mk | 11 ++++++-----
 lpsolve/ExternalProject_lpsolve.mk |  8 ++++----
 lpsolve/UnpackedTarball_lpsolve.mk |  2 +-
 lpsolve/lp_solve_5.5.patch         |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'lpsolve')

diff --git a/lpsolve/ExternalPackage_lpsolve.mk b/lpsolve/ExternalPackage_lpsolve.mk
index ed777ab0d748..498f9ca3747b 100644
--- a/lpsolve/ExternalPackage_lpsolve.mk
+++ b/lpsolve/ExternalPackage_lpsolve.mk
@@ -10,16 +10,16 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
 $(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-ifneq ($(GUI_FOR_BUILD),WNT)
+ifneq ($(OS_FOR_BUILD),WNT)
 $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a))
-endif # $(GUI_FOR_BUILD)
+endif # $(OS_FOR_BUILD)
 else # $(COM)
 $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
 endif # $(COM)
 $(eval $(call gb_ExternalPackage_add_files,lpsolve,bin,lpsolve55/lpsolve55.dll))
-else # $(GUI)
+else # $(OS)
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dylib))
@@ -31,5 +31,6 @@ $(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.so
 endif # $(DISABLE_DYNLOADING)
 
 endif # $(OS)
-endif # $(GUI)
+endif # $(OS)
+
 # vim: set noet sw=4 ts=4:
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
index 0b6e34ece615..1644b0f26930 100644
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ b/lpsolve/ExternalProject_lpsolve.mk
@@ -15,11 +15,11 @@ $(eval $(call gb_ExternalProject_register_targets,lpsolve,\
 	build \
 ))
 
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
 	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& $(if $(filter WNT,$(GUI_FOR_BUILD)), \
+	&& $(if $(filter WNT,$(OS_FOR_BUILD)), \
 	$(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \
 	$(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
 	cmd /c cgcc.bat, sh ccc) \
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build):
 	&& LIB="$(ILIB)" cmd /c cvc6.bat \
 	&& touch $@
 endif # $(COM)
-else # $(GUI)!=WNT
+else # $(OS)!=WNT
 $(call gb_ExternalProject_get_state_target,lpsolve,build):
 	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
 	&& sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
@@ -38,5 +38,5 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build):
 	$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \
 	ccc))) \
 	&& touch $@
-endif # $(GUI)
+endif # $(OS)
 # vim: set noet sw=4 ts=4:
diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk
index 2e895a03cb57..09cb1a2673ea 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
 
-ifeq ($(GUI_FOR_BUILD),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
 
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
 	lpsolve/lp_solve_5.5-windows.patch \
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index cea61168913d..7f976f0d85c8 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -19,7 +19,7 @@
 +pic=
 +ldflags=
 +inline=
-+if [ "$GUI" = "WNT" -a "$COM" = "GCC" ]; then
++if [ "$OS" = "WNT" -a "$COM" = "GCC" ]; then
 +     so=dll
 +     a=dll.a
 +     inline=-DINLINE=static
-- 
cgit