pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify DOWNLOAD macro
[surf.git]
/
config.mk
diff --git
a/config.mk
b/config.mk
index
e62e033
..
7972bb6
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-1,31
+1,32
@@
# surf version
# surf version
-VERSION =
0.5
+VERSION =
2.0
# Customize below to fit your system
# paths
PREFIX = /usr/local
# Customize below to fit your system
# paths
PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+MANPREFIX = $(PREFIX)/share/man
+LIBPREFIX = $(PREFIX)/lib/surf
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib
-GTKINC = `pkg-config --cflags gtk+-
2.0 webkit-1
.0`
-GTKLIB = `pkg-config --libs gtk+-
2.0 webkit-1
.0`
+GTKINC = `pkg-config --cflags gtk+-
3.0 gcr-3 webkit2gtk-4
.0`
+GTKLIB = `pkg-config --libs gtk+-
3.0 gcr-3 webkit2gtk-4
.0`
# includes and libs
# includes and libs
-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 \
- -ljavascriptcoregtk-1.0
+INCS = -I$(X11INC) $(GTKINC)
+LIBS = -L$(X11LIB) -lX11 $(GTKLIB) -lgthread-2.0
# flags
# flags
-CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -g ${LIBS}
+CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \
+ -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
+SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
+SURF_LDFLAGS = $(LIBS) $(LDFLAGS)
# Solaris
# Solaris
-#CFLAGS = -fast $
{INCS} -DVERSION=\"${VERSION}
\"
-#LDFLAGS = $
{LIBS}
+#CFLAGS = -fast $
(INCS) -DVERSION=\"$(VERSION)
\"
+#LDFLAGS = $
(LIBS)
# compiler and linker
# compiler and linker
-CC = cc
+#CC = c99