X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=config.mk;h=fa22f30b72639910333f032dd4686fd0d7fc980c;hp=5bec3e5cfcf97606463c23e0d52163b2f564682c;hb=b9cd3bb0bc3e897a44c8637b0da0fe0e28fa21c6;hpb=c870098b82f1dfc3cd59cd8c90cea580bd01cb47

diff --git a/config.mk b/config.mk
index 5bec3e5..fa22f30 100644
--- a/config.mk
+++ b/config.mk
@@ -6,26 +6,26 @@ VERSION = 2.0
 # 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 webkit2gtk-4.0`
-GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-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`
+WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
 
 # 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
-CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
-SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
-SURF_LDFLAGS = $(LIBS) $(LDFLAGS)
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
+           -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
+SURFCFLAGS = $(INCS) $(CPPFLAGS)
+WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
 
-# Solaris
-#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
-#LDFLAGS = $(LIBS)
-
-# compiler and linker
+# compiler
 #CC = c99