From 065f87637af506257022fd4ba669c2aac468115e Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 5 Dec 2010 01:20:41 +0000 Subject: [PATCH] Default to WebKit for the download utility as well --- src/Makefile | 4 ++-- src/project.conf | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index a8aa9c3..b9acf64 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,8 +21,8 @@ subdirs: @for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done download_OBJS = download.o -download_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 gnet-2.0` -download_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0 gnet-2.0` +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: $(download_OBJS) $(CC) -o download $(download_OBJS) $(download_LDFLAGS) diff --git a/src/project.conf b/src/project.conf index fbfeb9f..29161c5 100644 --- a/src/project.conf +++ b/src/project.conf @@ -9,11 +9,11 @@ dist=Makefile,callbacks.h,common.h,download.h,ghtml.h,surfer.h,ghtml-gtkhtml.c,g [download] 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 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` sources=download.c install=$(BINDIR)