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 --- connectivity/Library_postgresql-sdbc-impl.mk | 2 +- connectivity/Module_connectivity.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'connectivity') diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 8fbb372c2a7e..a69e3d86256a 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ )) ifneq ($(SYSTEM_POSTGRESQL),YES) -ifneq ($(GUI)$(COM),WNTMSC) +ifneq ($(OS)$(COM),WNTMSC) -include $(OUTDIR)/inc/postgresql/libpq-flags.mk diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 26dd64767ab9..0b5b22c54a1d 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -64,7 +64,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(GUI),UNX) +ifneq ($(OS),WNT) ifeq ($(ENABLE_KAB),TRUE) $(eval $(call gb_Module_add_targets,connectivity,\ @@ -92,7 +92,7 @@ endif endif -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_ado \ Library_ado \ @@ -145,7 +145,7 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ endif -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Module_add_check_targets,connectivity,\ CppunitTest_connectivity_ado \ )) -- cgit