Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7bd0bd49538b0ab0810588ed7525199797e8daaa
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7bd0bd49538b0ab0810588ed7525199797e8daaa
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7bd0bd49538b0ab0810588ed7525199797e8daaa
The branch, ashmew2/nskolibrios has been updated
via 7bd0bd49538b0ab0810588ed7525199797e8daaa (commit)
from 1ffbc36661f162d4801cc27c06de30cae4c7c84e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7bd0bd49538b0ab0810588ed7525199797e8daaa
commit 7bd0bd49538b0ab0810588ed7525199797e8daaa
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Clean up Makefile
diff --git a/Makefile b/Makefile
index 4647806..77bd03a 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
@@ -568,15 +566,6 @@ $(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))
-$(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,NSLOG,libnslog,LOG))
# List of directories in which headers are searched for
-----------------------------------------------------------------------
Summary of changes:
Makefile | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 4647806..77bd03a 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
@@ -568,15 +566,6 @@ $(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))
-$(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,NSLOG,libnslog,LOG))
# List of directories in which headers are searched for
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
