diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-03-09 22:39:10 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-03-09 22:39:10 +0000 |
| commit | 60e8bb79ff1c5141f72fb5f37d026b6400d47488 (patch) | |
| tree | 2bd0508bbb5aae3c22b6372306c710366b0bd3ab | |
| parent | b9885e81bafcb697263f6c4b5a7d13a9ab7e94a7 (diff) | |
| download | netsurf-60e8bb79ff1c5141f72fb5f37d026b6400d47488.tar.gz netsurf-60e8bb79ff1c5141f72fb5f37d026b6400d47488.tar.bz2 | |
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
| -rw-r--r-- | amiga/Makefile.target | 6 |
1 files changed, 4 insertions, 2 deletions
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 |