summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--!NetSurf/Resources/en/licence.html,faf6
-rw-r--r--!NetSurf/Resources/it/licence.html,faf6
-rw-r--r--Docs/BUILDING-AmigaCross15
-rw-r--r--Docs/BUILDING-AmigaOS15
-rw-r--r--Docs/BUILDING-Cocoa2
-rw-r--r--Docs/BUILDING-Framebuffer7
-rw-r--r--Docs/BUILDING-GTK6
-rw-r--r--Docs/BUILDING-Monkey2
-rw-r--r--Docs/BUILDING-ROCross2
-rw-r--r--Docs/BUILDING-Windows8
-rw-r--r--amiga/Makefile.target8
-rw-r--r--amiga/iff_dr2d.c2
-rwxr-xr-xamiga/pkg/makepackage2
-rw-r--r--atari/Makefile.target3
-rwxr-xr-xatari/scripts/makelibs.sh34
-rw-r--r--beos/Makefile.target4
-rw-r--r--cocoa/Makefile.target7
-rw-r--r--framebuffer/Makefile.target5
-rw-r--r--gtk/Makefile.target2
-rw-r--r--monkey/Makefile.target2
-rw-r--r--riscos/Makefile.target5
-rw-r--r--test/Makefile4
-rw-r--r--windows/Makefile.target8
23 files changed, 30 insertions, 125 deletions
diff --git a/!NetSurf/Resources/en/licence.html,faf b/!NetSurf/Resources/en/licence.html,faf
index 2f78da4ec..6375c56da 100644
--- a/!NetSurf/Resources/en/licence.html,faf
+++ b/!NetSurf/Resources/en/licence.html,faf
@@ -182,12 +182,6 @@ version.</p>
<span><a href="#png">PNG</a></span>
</dd>
-<dt><a href="http://xmlsoft.org">libxml2</a></dt>
-<dd>
-<span>&copy; 1998&ndash;2009 Daniel Veillard</span>
-<span><a href="#mit">MIT</a></span>
-</dd>
-
<dt><a href="http://www.riscos.info/websvn/listing.php?repname=gccsdk&path=%2Ftrunk%2Fgcc4%2Frecipe%2Ffiles%2Fgcc%2Flibunixlib%2F&#a9586e56e500c7fdfb58279167b82472d">UnixLib</a></dt>
<dd>
<span>&copy; 1995&ndash;1999 Simon Callan, Nick Burrett, Nicholas Clark and
diff --git a/!NetSurf/Resources/it/licence.html,faf b/!NetSurf/Resources/it/licence.html,faf
index 06ab13925..3194b3a98 100644
--- a/!NetSurf/Resources/it/licence.html,faf
+++ b/!NetSurf/Resources/it/licence.html,faf
@@ -174,12 +174,6 @@ dl.components > dd > span + span {
<span><a href="#png">PNG</a></span>
</dd>
-<dt><a href="http://xmlsoft.org">libxml2</a></dt>
-<dd>
-<span>&copy; 1998&ndash;2009 Daniel Veillard</span>
-<span><a href="#mit">MIT</a></span>
-</dd>
-
<dt><a href="http://www.riscos.info/websvn/listing.php?repname=gccsdk&path=%2Ftrunk%2Fgcc4%2Frecipe%2Ffiles%2Fgcc%2Flibunixlib%2F&#a9586e56e500c7fdfb58279167b82472d">UnixLib</a></dt>
<dd>
<span>&copy; 1995&ndash;1999 Simon Callan, Nick Burrett, Nicholas Clark and
diff --git a/Docs/BUILDING-AmigaCross b/Docs/BUILDING-AmigaCross
index fcd0889c1..da2e2adf0 100644
--- a/Docs/BUILDING-AmigaCross
+++ b/Docs/BUILDING-AmigaCross
@@ -49,21 +49,6 @@ CFLAGS="-DNO_FSEEKO" ./configure --prefix=/usr/local/amiga
make
make install
-libxml
-download the tarball from the project's homepage, untar in a storage directory /
-download source from your distribution's repository
-download the tarball from the project's homepage, untar in a storage directory /
-download source from your distribution's repository
-cd into the directory containing the configure file
-$ ./configure --prefix=/usr/local/amiga --host=ppc-amigaos
-$ make
-[need glob.h / change logic in runtest.c]
-$ make install
-
-alternative
-http://www.aminet.net/dev/lib/libxml.lha
-
-
regex [pre-compiled]
http://aminet.net/dev/lib/libregex-4.4.3.lha
diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS
index 1cb9e9502..4dabf4f11 100644
--- a/Docs/BUILDING-AmigaOS
+++ b/Docs/BUILDING-AmigaOS
@@ -100,21 +100,6 @@
http://www.aminet.net/package/dev/lib/libmng_so
- libxml2
----------
-
- libxml2 is available from Aminet:
-
- http://www.aminet.net/package/dev/lib/libxml2
-
- The shared object version included with OS4.1 does work with NetSurf,
- however the "ELF QuickFix" must be installed from Hyperion's website.
-
- The shared object can then be enabled with the following command:
-
- 1> makelink sdk:local/newlib/lib/libxml2.so sobjs:libxml2-2.6.so soft
-
-
OpenSSL
---------
diff --git a/Docs/BUILDING-Cocoa b/Docs/BUILDING-Cocoa
index 31a58ee81..d83800d79 100644
--- a/Docs/BUILDING-Cocoa
+++ b/Docs/BUILDING-Cocoa
@@ -36,7 +36,7 @@
"pkg-config" tool is required. It can be installed either via fink, macports
or homebrew or from source.
- OpenSSL, LibXML2, LibPNG, curl, iconv and zlib are provided by Mac OS X.
+ OpenSSL, LibPNG, curl, iconv and zlib are provided by Mac OS X.
The curl library provided by Mac OS X 10.6 causes a crash while fetching
https resources, so you should install version 7.21.4 (or newer) of libcurl
diff --git a/Docs/BUILDING-Framebuffer b/Docs/BUILDING-Framebuffer
index 4eb993f13..63ef02dd6 100644
--- a/Docs/BUILDING-Framebuffer
+++ b/Docs/BUILDING-Framebuffer
@@ -218,7 +218,7 @@ Index: framebuffer/font_freetype.c
Debian-like OS:
- $ apt-get install libcurl3-dev libxml2-dev libmng-dev
+ $ apt-get install libcurl3-dev libmng-dev
Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
note that when it has not been built with OpenSSL, the SSL_CTX is not
@@ -228,12 +228,11 @@ Index: framebuffer/font_freetype.c
Fedora:
- $ yum install curl-devel libxml2-devel libmng-devel lcms-devel
+ $ yum install curl-devel libmng-devel lcms-devel
Other:
- You'll need to install the development resources for libcurl3, libxml2 and
- libmng.
+ You'll need to install the development resources for libcurl3 and libmng.
Note that if you don't require MNG or JNG image support, NetSurf can be
configured to use libpng instead of libmng. If you wish to do this, install
diff --git a/Docs/BUILDING-GTK b/Docs/BUILDING-GTK
index 2749bf4ec..01f46320b 100644
--- a/Docs/BUILDING-GTK
+++ b/Docs/BUILDING-GTK
@@ -66,7 +66,7 @@
Debian-like OS:
- $ apt-get install libglade2-dev libcurl3-dev libxml2-dev libmng-dev
+ $ apt-get install libglade2-dev libcurl3-dev libmng-dev
$ apt-get install librsvg2-dev liblcms1-dev libjpeg-dev
Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
@@ -82,13 +82,13 @@
Fedora:
- $ yum install libglade2-devel curl-devel libxml2-devel libmng-devel
+ $ yum install libglade2-devel curl-devel libmng-devel
$ yum install librsvg2-devel lcms-devel
Other:
You'll need to install the development resources for libglade2, libcurl3,
- libxml2, libmng and librsvg.
+ libmng and librsvg.
Note that if you don't require MNG or JNG image support, NetSurf can be
configured to use libpng instead of libmng. If you wish to do this, install
diff --git a/Docs/BUILDING-Monkey b/Docs/BUILDING-Monkey
index b467c7c15..727124c34 100644
--- a/Docs/BUILDING-Monkey
+++ b/Docs/BUILDING-Monkey
@@ -62,7 +62,7 @@
Debian-like OS:
- $ apt-get install libcurl3-dev libxml2-dev
+ $ apt-get install libcurl3-dev
Recent OS versions might need libcurl4-dev instead of libcurl3-dev but
note that when it has not been built with OpenSSL, the SSL_CTX is not
diff --git a/Docs/BUILDING-ROCross b/Docs/BUILDING-ROCross
index bf0ca0c91..f82ff2ad7 100644
--- a/Docs/BUILDING-ROCross
+++ b/Docs/BUILDING-ROCross
@@ -46,8 +46,6 @@
$ ../autobuilder/build c-ares
- $ ../autobuilder/build libxml2
-
$ ../autobuilder/build libssl0.9.8
$ ../autobuilder/build libcurl3
diff --git a/Docs/BUILDING-Windows b/Docs/BUILDING-Windows
index 49b3ad344..dc6769fdf 100644
--- a/Docs/BUILDING-Windows
+++ b/Docs/BUILDING-Windows
@@ -137,14 +137,6 @@ EOF
$ PATH=/usr/i586-mingw32msvc/bin/:$PATH make CC=i586-mingw32msvc-gcc RANLIB=i586-mingw32msvc-ranlib
$ sudo make install
- libxml:
-
- $ apt-get source libxml2
- $ cd libxml2-2.7.6.dfsg
- $ ./configure --prefix=/usr/i586-mingw32msvc/ --disable-shared --without-python --host=i586-mingw32msvc
- $ make
- $ sudo make install
-
libcurl:
$ wget http://curl.haxx.se/download/curl-7.26.0.tar.gz
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 5b11ec018..af4b0bd83 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -33,7 +33,7 @@ ifeq ($(HOST),amiga)
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
CFLAGS += -I /SDK/local/common/include/libpng12
- LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl
+ LDFLAGS += -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl
LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES)
@@ -51,10 +51,10 @@ else
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libcurl openssl)
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl openssl)
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libdom libcss)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libdom libcss)
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
@@ -106,7 +106,7 @@ AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle
AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
AMIGA_LIBRARIES := parserutils.library nsgif.library nsbmp.library iconv.library hubbub.library
AMIGA_LIBS := $(addprefix /Libs/,$(AMIGA_LIBRARIES))
-AMIGA_SHARED_OBJS := libjpeg.so.12 libxml2.so.9 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 \
+AMIGA_SHARED_OBJS := libjpeg.so.12 libcurl.so.7 librtmp.so.0 libsvgtiny.so.0 \
libssl.so.1.0.0 libcrypto.so.1.0.0 libcss.so.0 libwapcaplet.so.0 libpng12.so \
libdom.so.0 libhubbub.so.0 libtre.so.5 libintl.so
AMIGA_SOBJS := $(addprefix /SObjs/,$(AMIGA_SHARED_OBJS))
diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c
index 8c2cdf7ac..b428ed25f 100644
--- a/amiga/iff_dr2d.c
+++ b/amiga/iff_dr2d.c
@@ -333,7 +333,7 @@ bool ami_save_svg(struct hlcache_handle *c,char *filename)
/*
* This code can be compiled as a standalone program for testing etc.
* Use something like the following line:
- * gcc -o svg2dr2d iff_dr2d.c -lauto -lsvgtiny -lxml2 -lpthread -lz -use-dynld
+ * gcc -o svg2dr2d iff_dr2d.c -lauto -lsvgtiny -lpthread -lz -use-dynld
* -DWITH_NS_SVG -DAMIGA_DR2D_STANDALONE -D__USE_INLINE__
*/
const char USED ver[] = "\0$VER: svg2dr2d 1.1 (18.05.2009)\0";
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index b99e52044..dcc130a6a 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -24,7 +24,7 @@ makedir ram:NetSurf/Libs
copy libs:parserutils.library libs:nsgif.library libs:nsbmp.library libs:iconv.library libs:hubbub.library ram:NetSurf/Libs
; libs:css.library libs:wapcaplet.library
makedir ram:NetSurf/SObjs
-copy sobjs:libjpeg.so.8 sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone
+copy sobjs:libjpeg.so.8 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone
;sobjs:libhpdf-2.2.0.so.0.0
echo "Splitting Messages file"
perl utils/split-messages.pl de ami < resources/FatMessages >RAM:NetSurf/Resources/de/Messages
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 844abfe31..575610cac 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -63,13 +63,12 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -I. -Dsmall $(WARNFLAGS) -Dnsatari \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
$(shell $(PKG_CONFIG) --cflags libhubbub libcss openssl ) \
- $(shell $(PKG_CONFIG) --cflags libxml-2.0 ) \
$(shell $(PKG_CONFIG) --cflags libcurl )
LDFLAGS += -lcflib -lcurl
LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub
LDFLAGS += -lssl -lcrypto
-LDFLAGS += -lxml2 -lz -liconv -lcares -lHermes -lwindom -lgem -lm
+LDFLAGS += -lz -liconv -lcares -lHermes -lwindom -lgem -lm
LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
diff --git a/atari/scripts/makelibs.sh b/atari/scripts/makelibs.sh
index c479b1ea8..80c316147 100755
--- a/atari/scripts/makelibs.sh
+++ b/atari/scripts/makelibs.sh
@@ -33,7 +33,6 @@ libcurlpkg="curl-7.25.0"
libfreetypepkg="freetype-2.4.9"
libhermespkg="Hermes-1.3.3"
libjpegpkg="jpeg-8b"
-libxmlpkg="libxml2-2.7.8"
libparserutils_version=0.1.1
libwapcaplet_version=0.1.1
hubbub_version=0.1.2
@@ -364,38 +363,6 @@ fi
cd ..
-cd $libxmlpkg
-$cleanup
-if [ "$cross" = "1" ]
-then
-./configure --prefix="$prefix" \
- --host="m68k-atari-mint" \
- --without-python \
- --without-threads \
- --enable-ipv6=no \
- --without-debug \
- --without-http \
- --without-ftp \
- --without-legacy \
- --without-docbook \
- --without-catalog \
- --without-regexps \
- --without-schemas \
- --without-schematron \
- --without-sax1 \
- --without-xpath \
- --without-modules \
- --without-c14n \
- --without-pattern \
- --without-push \
- --with-iconv="$archlibdir" \
- --with-zlib="$archlibdir"
-make
-make install DESTDIR="$userfs"
-else
-echo "no cross"
-fi
-cd ..
cd $libopensslpkg
$cleanup
@@ -620,6 +587,5 @@ else
mv $srcpkgdir $archlibdir -v
fi
-echo "please add symlink to libxml2/libxml within /usr/m68k-atari-mint/include"
echo "please add symlink to freetype2/freetype within /usr/m68k-atari-mint/include"
exit 0
diff --git a/beos/Makefile.target b/beos/Makefile.target
index b1d1eaab5..af7c939ad 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -9,7 +9,7 @@
# for Haiku
LDFLAGS += -L/boot/common/lib
# some people do *not* have libm...
- LDFLAGS += -lxml2 -lcurl -liconv
+ LDFLAGS += -lcurl -liconv
LDFLAGS += -lssl -lcrypto -lcss -ldom -lparserutils -lhubbub -lwapcaplet
CFLAGS += -I. -O $(WARNFLAGS) -Dnsbeos \
@@ -31,7 +31,6 @@
RESOURCES = $(RSRC_BEOS)
ifeq ($(HOST),beos)
CFLAGS += -I/boot/home/config/include \
- -I/boot/home/config/include/libxml2 \
-I/boot/home/config/include/libmng \
-I/boot/home/config/include/hubbub \
-I/boot/home/config/include/libcss \
@@ -42,7 +41,6 @@
ifneq ($(wildcard /boot/develop/lib/*/libnetwork.so),)
# Haiku
CFLAGS += -I/boot/common/include \
- -I/boot/common/include/libxml2 \
-I/boot/common/include/libmng \
-I/boot/common/include/hubbub \
-I/boot/common/include/libcss \
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index fd78e5e11..27f3b08b9 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -5,9 +5,9 @@
POSTEXES += NetSurf.app
LDFLAGS += -L/usr/lib
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libhubbub libcss libdom)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss libdom)
LDFLAGS += -L/usr/X11/lib
- LDFLAGS += -lm -lxml2 -lcurl -liconv
+ LDFLAGS += -lm -lcurl -liconv
LDFLAGS += -lssl -lcrypto
CFLAGS += -I. -O $(WARNFLAGS) -Dnscocoa \
@@ -16,7 +16,7 @@
CFLAGS += -g -Os -Wno-uninitialized
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libhubbub libcss libdom)
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libhubbub libcss libdom)
# shut up zconf.h and zlib.h
#CFLAGS += -D_LARGEFILE64_SOURCE=1
@@ -38,7 +38,6 @@ endif
CXXFLAGS := $(SDK_FLAGS) $(CXXFLAGS)
CFLAGS += -I/usr/X11/include
- CFLAGS += -I/usr/include/libxml2
CFLAGS += -include cocoa/Prefix.pch
# VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c)
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 1de6a0385..f55499770 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -59,15 +59,12 @@ ifeq ($(HOST),mint)
LDFLAGS += $(shell curl-config --libs)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub openssl libcss)
- # xml-config returns -lsocket which is not needed and does not
- # exist on all systems. because of that - hardcoded reference to
- # libxml-2.0 here.
LDFLAGS += -L/usr/lib/ -lz -liconv
LDFLAGS += -lm
else
CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libdom openssl)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcss)
endif
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 91ffb526e..1b2bef526 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -7,7 +7,7 @@
# GTK flag setup (using pkg-config)
# ----------------------------------------------------------------------------
-LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libdom libcss)
+LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom libcss)
LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl)
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
diff --git a/monkey/Makefile.target b/monkey/Makefile.target
index 8ca03b582..b8891d3e0 100644
--- a/monkey/Makefile.target
+++ b/monkey/Makefile.target
@@ -8,7 +8,7 @@
# ----------------------------------------------------------------------------
-LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libdom libcss)
+LDFLAGS += $(shell $(PKG_CONFIG) --libs libcurl libdom libcss)
LDFLAGS += $(shell $(PKG_CONFIG) --libs openssl)
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index ae367fe78..53b329676 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -8,10 +8,10 @@
# ----------------------------------------------------------------------------
ifeq ($(HOST),riscos)
- LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lcares
+ LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lz -lm -lcurl -lcares
LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
else
- LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcares libcurl openssl)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libcares libcurl openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libdom libcss)
endif
@@ -43,7 +43,6 @@ CFLAGS += -I. $(WARNFLAGS) -Driscos \
-mpoke-function-name -fno-strict-aliasing
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include \
- -I$(GCCSDK_INSTALL_ENV)/include/libxml2 \
-I$(GCCSDK_INSTALL_ENV)/include/libmng
ifeq ($(HOST),riscos)
CFLAGS += -I<OSLib$$Dir> -mthrowback
diff --git a/test/Makefile b/test/Makefile
index 759d5f9c8..83468e70b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,6 +1,6 @@
CFLAGS := -std=c99 -g -O0 -D_BSD_SOURCE -D_POSIX_C_SOURCE -I.. \
- $(shell pkg-config --cflags libxml-2.0 libcurl)
-LDFLAGS := $(shell pkg-config --libs libxml-2.0 libcurl) -lz
+ $(shell pkg-config --cflags libcurl)
+LDFLAGS := $(shell pkg-config --libs libcurl) -lz
llcache_CFLAGS := $(shell pkg-config --cflags libparserutils libwapcaplet)
llcache_LDFLAGS := $(shell pkg-config --libs libparserutils libwapcaplet)
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 6dca79013..90f97fbea 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -19,11 +19,11 @@
ifneq ($(PKG_CONFIG),)
CFLAGS += $(shell $(PKG_CONFIG) --cflags zlib libcares libcurl libhubbub \
- libparserutils libdom libwapcaplet libxml-2.0)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl libcares \
+ libparserutils libdom libwapcaplet)
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libcurl libcares \
libhubbub libparserutils libcss libdom libwapcaplet)
else
- LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz
+ LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lcurl -lz
endif
LDFLAGS += -lssl -lcrypto -lregex -liconv \
@@ -42,7 +42,7 @@
WSCFLAGS := -std=c99 \
$(WARNFLAGS) -I. \
- -DCURL_STATICLIB -DLIBXML_STATIC -DCARES_STATICLIB -g
+ -DCURL_STATICLIB -DCARES_STATICLIB -g
CFLAGS += $(WSCFLAGS)
LDFLAGS += $(WSCFLAGS)