X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=config.mk;h=5e68e38338639472b64b12f8668b6d2794559811;hp=df6e812807d83a757f465917286d824640d6a1b6;hb=72972094bab647bd062cffbbf42de3b2f204ca06;hpb=b814567e2bf8bda07cea8de1c7a062f4aa437b65

diff --git a/config.mk b/config.mk
index df6e812..5e68e38 100644
--- a/config.mk
+++ b/config.mk
@@ -5,27 +5,27 @@ VERSION = 2.0
 
 # paths
 PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
-LIBPREFIX = ${PREFIX}/lib/surf
+MANPREFIX = $(PREFIX)/share/man
+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. -I/usr/include -I${X11INC} ${GTKINC}
-LIBS = -L/usr/lib -lc -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
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
+           -D_DEFAULT_SOURCE -DGCR_API_SUBJECT_TO_CHANGE
+SURFCFLAGS = $(INCS) $(CPPFLAGS) -fPIC
+WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
 
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-
-# compiler and linker
-CC = cc
+# compiler
+#CC = c99