diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2013-12-22 14:10:55 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-01-04 16:13:10 +0000 |
| commit | 5a408069c95674bc6e591d0f3a65d3d810746a0f (patch) | |
| tree | d9debe1ae653d266978a287ec6397c03d7430492 | |
| parent | c239a98dd9b93f32418bd8636dd1051cb8a02c36 (diff) | |
| download | netsurf-5a408069c95674bc6e591d0f3a65d3d810746a0f.tar.gz netsurf-5a408069c95674bc6e591d0f3a65d3d810746a0f.tar.bz2 | |
remove lcms dependancy as NetSurf does not directaly use it.
The dependancy probbaly comes from our historical use of libmng,
even then the libmng pkg-config should bring it in.
| -rw-r--r-- | Docs/BUILDING-GTK | 4 | ||||
| -rw-r--r-- | Docs/env.sh | 2 | ||||
| -rw-r--r-- | gtk/Makefile.target | 1 | ||||
| -rw-r--r-- | monkey/Makefile.target | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Docs/BUILDING-GTK b/Docs/BUILDING-GTK index 16b15a4af..35fcd02db 100644 --- a/Docs/BUILDING-GTK +++ b/Docs/BUILDING-GTK @@ -67,7 +67,7 @@ Debian-like OS: $ apt-get install libgtk2.0-dev libcurl3-dev libmng-dev - $ apt-get install librsvg2-dev liblcms1-dev libjpeg-dev + $ apt-get install librsvg2-dev libjpeg-dev If you want to build with gtk 3 replace libgtk2.0-dev with libgtk-3-dev @@ -85,7 +85,7 @@ Fedora: $ yum install curl-devel libmng-devel - $ yum install librsvg2-devel lcms-devel expat-devel + $ yum install librsvg2-devel expat-devel Other: diff --git a/Docs/env.sh b/Docs/env.sh index db2729c0c..8946e46e2 100644 --- a/Docs/env.sh +++ b/Docs/env.sh @@ -53,7 +53,7 @@ NS_BROWSER="netsurf" # deb packages NS_DEV_DEB="build-essential pkg-config git gperf" NS_TOOL_DEB="flex bison" -NS_GTK_DEB="libgtk2.0-dev libcurl3-dev libmng-dev librsvg2-dev liblcms1-dev libjpeg-dev libmozjs-dev" +NS_GTK_DEB="libgtk2.0-dev libcurl3-dev libmng-dev librsvg2-dev libjpeg-dev libmozjs-dev" #add target specific libraries if [ "x${TARGET_ABI}" = "xriscos" ]; then diff --git a/gtk/Makefile.target b/gtk/Makefile.target index ae67fd7f4..426c4affd 100644 --- a/gtk/Makefile.target +++ b/gtk/Makefile.target @@ -62,7 +62,6 @@ $(eval $(call pkg_config_find_and_add,libcurl,Curl )) $(eval $(call pkg_config_find_and_add,gtk+-$(NETSURF_GTK_MAJOR).0,GTK-$(NETSURF_GTK_MAJOR))) $(eval $(call pkg_config_find_and_add,gthread-2.0,GThread2)) $(eval $(call pkg_config_find_and_add,gmodule-2.0,GModule2)) -$(eval $(call pkg_config_find_and_add,lcms,lcms)) CFLAGS += $(GTKCFLAGS) diff --git a/monkey/Makefile.target b/monkey/Makefile.target index 6c60ca1c5..6bea07d46 100644 --- a/monkey/Makefile.target +++ b/monkey/Makefile.target @@ -47,7 +47,7 @@ MONKEYCFLAGS := -std=c99 -Dmonkey -Dnsmonkey \ $(shell $(PKG_CONFIG) --cflags openssl) \ $(shell xml2-config --cflags) -MONKEYLDFLAGS := -lm $(shell $(PKG_CONFIG) --cflags --libs glib-2.0 lcms) +MONKEYLDFLAGS := -lm CFLAGS += $(MONKEYCFLAGS) |