Now defaulting to the Webkit-based widget

This commit is contained in:
Pierre Pronchery 2009-04-17 20:44:48 +00:00
parent 801c938ceb
commit 45d92375f0
4 changed files with 9 additions and 9 deletions

View File

@ -1,5 +1,5 @@
PACKAGE = Surfer PACKAGE = Surfer
VERSION = 0.0.5 VERSION = 0.0.6
SUBDIRS = src SUBDIRS = src
RM = rm -f RM = rm -f
LN = ln -sf LN = ln -sf

View File

@ -1,5 +1,5 @@
#define PACKAGE "Surfer" #define PACKAGE "Surfer"
#define VERSION "0.0.5" #define VERSION "0.0.6"
#ifndef PREFIX #ifndef PREFIX
# define PREFIX "/usr/local" # define PREFIX "/usr/local"

View File

@ -23,8 +23,8 @@ download: $(download_OBJS)
$(CC) -o download $(download_OBJS) $(download_LDFLAGS) $(CC) -o download $(download_OBJS) $(download_LDFLAGS)
surfer_OBJS = surfer.o ghtml.o callbacks.o main.o 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_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D WITH_WEBKIT $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0 webkit-1.0`
surfer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0 firefox-gtkmozembed` -l System 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) surfer: $(surfer_OBJS)
$(CC) -o surfer $(surfer_OBJS) $(surfer_LDFLAGS) $(CC) -o surfer $(surfer_OBJS) $(surfer_LDFLAGS)

View File

@ -14,14 +14,14 @@ install=$(BINDIR)
[surfer] [surfer]
type=binary type=binary
cflags=`pkg-config --cflags gtk+-2.0 firefox-gtkmozembed` #cflags=`pkg-config --cflags gtk+-2.0 firefox-gtkmozembed`
ldflags=`pkg-config --libs gtk+-2.0 firefox-gtkmozembed` -l System #ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -l System `pkg-config --libs gtk+-2.0 firefox-gtkmozembed`
#cppflags=-D WITH_GTKHTML #cppflags=-D WITH_GTKHTML
#cflags=`pkg-config --cflags gtk+-2.0 libgtkhtml-2.0 gnet-2.0` #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` #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 cppflags=-D WITH_WEBKIT
#cflags=`pkg-config --cflags gtk+-2.0 webkit-1.0` 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` 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 sources=surfer.c,ghtml.c,callbacks.c,main.c
install=$(BINDIR) install=$(BINDIR)