From c29098917a1118d4b435df2b5f542adc8505e123 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist 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 Tested-by: Peter Foley --- dbaccess/Library_dbu.mk | 6 +++--- dbaccess/Module_dbaccess.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 9bfe58bb6758..ba95c73734fc 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,dbu,\ -DDBACCESS_DLLIMPLEMENTATION \ )) -ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h +ifeq ($(OS)$(COM),WNTGCC) # for adoint.h $(eval $(call gb_Library_add_cxxflags,dbu,\ -fpermissive \ )) @@ -74,7 +74,7 @@ $(eval $(call gb_Library_use_libraries,dbu,\ $(gb_UWINAPI) \ )) -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,dbu,\ ole32 \ oleaut32 \ @@ -268,7 +268,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/uno/UserSettingsDlg \ )) -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/dlg/adodatalinks \ )) diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index f087ba8e5c19..3195bbf1ff85 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\ AllLangResTarget_dbmm \ AllLangResTarget_dbu \ AllLangResTarget_sdbt \ - $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \ + $(if $(filter WNT,$(OS)),Executable_odbcconfig) \ Library_dba \ Library_dbaxml \ Library_dbmm \ -- cgit