From 60e8bb79ff1c5141f72fb5f37d026b6400d47488 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Wed, 9 Mar 2011 22:39:10 +0000 Subject: Fix up pkg-config package ordering to ensure that libcares appears after libcurl in the link line Link against libauto when cross compiling for AmigaOS4 svn path=/trunk/netsurf/; revision=11957 --- amiga/Makefile.target | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'amiga') diff --git a/amiga/Makefile.target b/amiga/Makefile.target index a8efd5c33..94fa8dd49 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -44,15 +44,17 @@ else $(eval $(call pkg_config_find_and_add,NSSVG,libsvgtiny,NSSVG)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include - CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libcares libcurl openssl) + CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libcurl libcares openssl) CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libhubbub libcss) - LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcares libcurl openssl) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libcares openssl) LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libhubbub libcss) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib ifeq ($(SUBTARGET),os3) LDFLAGS += -liconv + else + LDFLAGS += -lauto endif EXETARGET := NetSurf -- cgit v1.2.3