From bb6774a2bd894cbd1a4fb2c936de342b41c92909 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 2 Dec 2014 10:29:26 +0100 Subject: fix typo and libmerged build Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858 --- Library_merged.mk | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'Library_merged.mk') diff --git a/Library_merged.mk b/Library_merged.mk index d3c5e75c840e..90f30a108da9 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -30,19 +30,10 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(gb_UWINAPI) \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_use_static_libraries,gengal,\ - glxtest \ - $(if $(filter unx,$(GUIBASE)),headless) \ -)) -endif - -ifneq ($(OS),LINUX) $(eval $(call gb_Library_use_static_libraries,merged,\ + $(if $(filter LINUX,$(OS)),glxtest) \ $(if $(filter unx,$(GUIBASE)),headless) \ )) -endif - $(eval $(call gb_Library_use_externals,merged,\ icu_headers \ -- cgit