X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=config.mk;h=2cb1bd41182ec20a96cc7e8b0313ae017a3ffd6b;hp=8d96b2987c222e60c30b71f4cb6b2a912dd49a38;hb=3321c42d36ce79ebecd8b2ea7e93ca2e5c2ff98d;hpb=e7c629b258653a5237ca72cf2087a391e55829f1

diff --git a/config.mk b/config.mk
index 8d96b29..2cb1bd4 100644
--- a/config.mk
+++ b/config.mk
@@ -6,7 +6,8 @@ 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
@@ -14,25 +15,17 @@ X11LIB = /usr/X11R6/lib
 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`
+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
 
 # flags
-CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBPREFIX)\" \
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
            -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)
+WEBEXTCFLAGS = -fPIC $(WEBEXTINC)
 
-# Solaris
-#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
-#LDFLAGS = $(LIBS)
-
-# compiler and linker
+# compiler
 #CC = c99
-LIBTOOL = libtool --quiet