diff options
author | Rob Kendrick <rjek@netsurf-browser.org> | 2008-07-28 21:44:24 +0000 |
---|---|---|
committer | Rob Kendrick <rjek@netsurf-browser.org> | 2008-07-28 21:44:24 +0000 |
commit | 238ebca344e5450face62990e6e0068917bf2165 (patch) | |
tree | 780f8cd7f89ccf53dac0857d314072a546ea9e90 | |
parent | 97e1d9503f67561488fc3ad26ae18f4b463be6e6 (diff) | |
download | netsurf-238ebca344e5450face62990e6e0068917bf2165.tar.gz netsurf-238ebca344e5450face62990e6e0068917bf2165.tar.bz2 |
Whoops. Append, don't overwrite.
svn path=/trunk/netsurf/; revision=4779
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | Makefile.config | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -170,7 +170,7 @@ LDFLAGS += -lz # ---------------------------------------------------------------------------- ifeq ($(HOST),riscos) -LDFLAGS := -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lssl \ +LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lssl \ -lcrypto -lcares endif @@ -188,7 +188,7 @@ endif # ---------------------------------------------------------------------------- ifeq ($(HOST),beos) -LDFLAGS := -L/boot/home/config/lib +LDFLAGS += -L/boot/home/config/lib LDFLAGS += -lxml2 -lz -lcurl -lssl -lcrypto -liconv endif @@ -197,7 +197,7 @@ endif # ---------------------------------------------------------------------------- ifeq ($(TARGET),gtk) -LDFLAGS := $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl) +LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl) # 1: Feature name (ie, NETSURF_USE_RSVG -> RSVG) # 2: pkg-config required modules for feature diff --git a/Makefile.config b/Makefile.config index b3dd3591f..a29db2674 100644 --- a/Makefile.config +++ b/Makefile.config @@ -28,7 +28,7 @@ NETSURF_USE_MNG=YES # Use libharu to enable PDF export and GTK printing support. There is no # auto-detection available for this, as it does not have a pkg-config file # Valid options: YES, NO -NETSURF_USE_HARU_PDF=YES +NETSURF_USE_HARU_PDF=NO # ---------------------------------------------------------------------------- # RISC OS-specific options |