pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile: include common to webext
[surf.git]
/
config.mk
diff --git
a/config.mk
b/config.mk
index
8d96b29
..
5e68e38
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-6,33
+6,26
@@
VERSION = 2.0
# paths
PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man
# paths
PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man
-LIBPREFIX = $(PREFIX)/lib/surf
+LIBPREFIX = $(PREFIX)/lib
+LIBDIR = $(LIBPREFIX)/surf
-X11INC =
/usr/X11R6/include
-X11LIB =
/usr/X11R6/lib
+X11INC =
`pkg-config --cflags x11`
+X11LIB =
`pkg-config --libs x11`
GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.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`
WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
-WEBEXTLIB = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
+WEBEXTLIB
S
= `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
# includes and libs
# includes and libs
-INCS =
-I
$(X11INC) $(GTKINC)
-LIBS =
-L$(X11LIB) -lX11
$(GTKLIB) -lgthread-2.0
+INCS = $(X11INC) $(GTKINC)
+LIBS =
$(X11LIB)
$(GTKLIB) -lgthread-2.0
# flags
# flags
-CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIB
PREFIX
)\" \
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIB
DIR
)\" \
-D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
-D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
-SURFCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
-SURFLDFLAGS = $(LIBS) $(LDFLAGS)
-LIBCPPFLAGS = -DWEBEXTDIR=\"$(LIBPREFIX)\"
-LIBCFLAGS = $(WEBEXTINC) $(LIBCPPFLAGS) $(CFLAGS)
-LIBLDFLAGS = $(WEBEXTLIB) $(LDFLAGS)
+SURFCFLAGS = $(INCS) $(CPPFLAGS) -fPIC
+WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
-# Solaris
-#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
-#LDFLAGS = $(LIBS)
-
-# compiler and linker
+# compiler
#CC = c99
#CC = c99
-LIBTOOL = libtool --quiet