From 238ebca344e5450face62990e6e0068917bf2165 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Mon, 28 Jul 2008 21:44:24 +0000 Subject: Whoops. Append, don't overwrite. svn path=/trunk/netsurf/; revision=4779 --- Makefile | 6 +++--- Makefile.config | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0e02f8189..1de11f847 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3