From 26cc933030ee48217c0008ea3e8eac9ad8b92150 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 11 Dec 2010 17:20:06 +0000
Subject: [PATCH] Using libSystem and libDesktop through pkg-config

---
 src/Makefile     | 10 +++++-----
 src/project.conf | 25 ++++++++++++-------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index b9acf64..210299b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,7 +5,7 @@ DESTDIR	=
 BINDIR	= $(PREFIX)/bin
 CC	= cc
 CPPFLAGSF=
-CPPFLAGS= -I $(PREFIX)/include
+CPPFLAGS=
 CFLAGSF	= -W
 CFLAGS	= -Wall -g -O2 -pedantic
 LDFLAGS	= 
@@ -21,15 +21,15 @@ subdirs:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
 
 download_OBJS = download.o
-download_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 webkit-1.0`
-download_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem `pkg-config --libs gtk+-2.0 webkit-1.0`
+download_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0 webkit-1.0`
+download_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0 webkit-1.0`
 
 download: $(download_OBJS)
 	$(CC) -o download $(download_OBJS) $(download_LDFLAGS)
 
 surfer_OBJS = surfer.o ghtml.o callbacks.o main.o
-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 -lSystem -lDesktop `pkg-config --libs gtk+-2.0 webkit-1.0`
+surfer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem libDesktop webkit-1.0`
+surfer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem libDesktop webkit-1.0`
 
 surfer: $(surfer_OBJS)
 	$(CC) -o surfer $(surfer_OBJS) $(surfer_LDFLAGS)
diff --git a/src/project.conf b/src/project.conf
index 29161c5..6dce336 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,7 +1,6 @@
 subdirs=common
 targets=download,surfer
-cppflags=-I $(PREFIX)/include
-#cppflags=-I $(PREFIX)/include -D EMBEDDED
+#cppflags=-D EMBEDDED
 cflags_force=-W
 cflags=-Wall -g -O2 -pedantic
 ldflags=
@@ -12,8 +11,8 @@ type=binary
 #cflags=`pkg-config --cflags gtk+-2.0 gnet-2.0`
 #ldflags=`pkg-config --libs gtk+-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 -lSystem `pkg-config --libs gtk+-2.0 webkit-1.0`
+cflags=`pkg-config --cflags libSystem gtk+-2.0 webkit-1.0`
+ldflags=`pkg-config --libs libSystem gtk+-2.0 webkit-1.0`
 sources=download.c
 install=$(BINDIR)
 
@@ -24,17 +23,17 @@ cppflags=-D WITH_MAIN
 [surfer]
 type=binary
 #cppflags=-D WITH_GTKMOZEMBED
-#cflags=`pkg-config --cflags gtk+-2.0 mozilla-gtkmozembed`
-#ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem -lDesktop `pkg-config --libs gtk+-2.0 mozilla-gtkmozembed`
+#cflags=`pkg-config --cflags libSystem libDesktop mozilla-gtkmozembed`
+#ldflags=`pkg-config --libs libSystem libDesktop mozilla-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 -lSystem -lDesktop `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 -lSystem -lDesktop `pkg-config --libs gtk+-2.0 webkit-1.0`
+#cflags=`pkg-config --cflags libSystem libDesktop libgtkhtml-2.0 gnet-2.0`
+#ldflags=`pkg-config --libs libSystem libDesktop libgtkhtml-2.0 gnet-2.0`
 #cppflags=-D WITH_GTKTEXTVIEW
-#cflags=`pkg-config --cflags gtk+-2.0 gnet-2.0`
-#ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem -lParser -lDesktop `pkg-config --libs gtk+-2.0 gnet-2.0`
+#cflags=`pkg-config --cflags libSystem libDesktop gnet-2.0`
+#ldflags=`pkg-config --libs libSystem libDesktop gnet-2.0`
+cppflags=-D WITH_WEBKIT
+cflags=`pkg-config --cflags libSystem libDesktop webkit-1.0`
+ldflags=`pkg-config --libs libSystem libDesktop webkit-1.0`
 sources=surfer.c,ghtml.c,callbacks.c,main.c
 install=$(BINDIR)