From 45d92375f038118a1ffca08ae7c4732f7e85987e Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Fri, 17 Apr 2009 20:44:48 +0000
Subject: [PATCH] Now defaulting to the Webkit-based widget

---
 Makefile         |  2 +-
 config.h         |  2 +-
 src/Makefile     |  4 ++--
 src/project.conf | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 516fce5..55ac65f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE	= Surfer
-VERSION	= 0.0.5
+VERSION	= 0.0.6
 SUBDIRS	= src
 RM	= rm -f
 LN	= ln -sf
diff --git a/config.h b/config.h
index ff03864..6a4b1d0 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 #define PACKAGE "Surfer"
-#define VERSION "0.0.5"
+#define VERSION "0.0.6"
 
 #ifndef PREFIX
 # define PREFIX "/usr/local"
diff --git a/src/Makefile b/src/Makefile
index 6bec873..2981629 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,8 +23,8 @@ download: $(download_OBJS)
 	$(CC) -o download $(download_OBJS) $(download_LDFLAGS)
 
 surfer_OBJS = surfer.o ghtml.o callbacks.o main.o
-surfer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
-surfer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0 firefox-gtkmozembed` -l System
+surfer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 webkit-1.0`
+surfer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -l System `pkg-config --libs gtk+-2.0 webkit-1.0`
 
 surfer: $(surfer_OBJS)
 	$(CC) -o surfer $(surfer_OBJS) $(surfer_LDFLAGS)
diff --git a/src/project.conf b/src/project.conf
index 6a282ae..a8ccc67 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -14,14 +14,14 @@ install=$(BINDIR)
 
 [surfer]
 type=binary
-cflags=`pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
-ldflags=`pkg-config --libs gtk+-2.0 firefox-gtkmozembed` -l System
+#cflags=`pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
+#ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -l System `pkg-config --libs gtk+-2.0 firefox-gtkmozembed`
 #cppflags=-D WITH_GTKHTML
 #cflags=`pkg-config --cflags gtk+-2.0 libgtkhtml-2.0 gnet-2.0`
 #ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -l System `pkg-config --libs gtk+-2.0 libgtkhtml-2.0 gnet-2.0`
-#cppflags=-D WITH_WEBKIT
-#cflags=`pkg-config --cflags gtk+-2.0 webkit-1.0`
-#ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -l System `pkg-config --libs gtk+-2.0 webkit-1.0`
+cppflags=-D WITH_WEBKIT
+cflags=`pkg-config --cflags gtk+-2.0 webkit-1.0`
+ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -l System `pkg-config --libs gtk+-2.0 webkit-1.0`
 sources=surfer.c,ghtml.c,callbacks.c,main.c
 install=$(BINDIR)