diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-02 10:29:26 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-02 10:31:08 +0100 |
| commit | bb6774a2bd894cbd1a4fb2c936de342b41c92909 (patch) | |
| tree | 27bd8f0f850f248617085408885db43a70eec11d /Library_merged.mk | |
| parent | 3b0db84516503ce72b803bf04b0432b36c1ac70c (diff) | |
fix typo and libmerged build
Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858
Diffstat (limited to 'Library_merged.mk')
| -rw-r--r-- | Library_merged.mk | 11 |
1 files changed, 1 insertions, 10 deletions
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 \ |