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
This commit is contained in:
John Mark Bell 2011-03-09 22:39:10 +00:00
parent b9885e81ba
commit 60e8bb79ff

View File

@ -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