fix typo and libmerged build

Change-Id: I76541a960d3b81d1bc44efa323c6f1349a4cb858

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 \