From 7bd0bd49538b0ab0810588ed7525199797e8daaa Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Sat, 28 Oct 2017 15:36:05 +0200 Subject: Clean up Makefile --- Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 4647806c8..77bd03adb 100644 --- a/Makefile +++ b/Makefile @@ -531,10 +531,8 @@ $(eval $(call pkg_config_find_and_add,libdom,DOM)) $(eval $(call pkg_config_find_and_add,libnsutils,nsutils)) $(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) -ifneq ($(TARGET),kolibrios) - # Common libraries without pkg-config support - LDFLAGS += -lz -endif +# Common libraries without pkg-config support +LDFLAGS += -lz # Optional libraries with pkgconfig @@ -562,15 +560,6 @@ else endif $(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL)) -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) -$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) -$(eval $(call pkg_config_find_and_add_enabled,NSPSL,libnspsl,PSL)) - -$(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL)) - $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -- cgit v1.2.3