tMerge remote-tracking branch 'upstream/surf-webkit2' into master - surf - [fork] customized build of surf, the suckless webkit browser
 (HTM) git clone git://src.adamsgaard.dk/surf
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit d5b34aa90fd5b2178743cb63b09cd559d6316d23
 (DIR) parent 3334d3b1f2d1e8fd3663e1d86139b27d20fe9931
 (HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
       Date:   Mon,  9 Nov 2020 08:20:28 +0100
       
       Merge remote-tracking branch 'upstream/surf-webkit2' into master
       
       Diffstat:
         M Makefile                            |      19 +++++++++----------
         M config.mk                           |       4 ++--
       
       2 files changed, 11 insertions(+), 12 deletions(-)
       ---
 (DIR) diff --git a/Makefile b/Makefile
       t@@ -21,22 +21,22 @@ options:
                @echo "WEBEXTCFLAGS  = $(WEBEXTCFLAGS) $(CFLAGS)"
                @echo "LDFLAGS       = $(LDFLAGS)"
        
       -.c.o:
       -        $(CC) $(SURFCFLAGS) $(CFLAGS) -c $<
       +surf: $(OBJ)
       +        $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
        
       -.o.so:
       -        $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS)
       +$(OBJ) $(WOBJ): config.h common.h config.mk
        
        config.h:
                cp config.def.h $@
        
       -$(OBJ) $(WOBJ): config.h common.h config.mk
       +$(OBJ): $(SRC)
       +        $(CC) $(SURFCFLAGS) $(CFLAGS) -c $(SRC)
        
       -surf: $(OBJ)
       -        $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
       +$(WLIB): $(WOBJ)
       +        $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $? $(WEBEXTLIBS)
        
       -$(WOBJ):
       -        $(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(@:.o=.c)
       +$(WOBJ): $(WSRC)
       +        $(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(WSRC)
        
        clean:
                rm -f surf $(OBJ)
       t@@ -75,5 +75,4 @@ uninstall:
                done
                - rmdir $(DESTDIR)$(LIBDIR)
        
       -.SUFFIXES: .so .o .c
        .PHONY: all options distclean clean dist install uninstall
 (DIR) diff --git a/config.mk b/config.mk
       t@@ -14,8 +14,8 @@ 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`
       -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
       +WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
       +WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
        
        # includes and libs
        INCS = $(X11INC) $(GTKINC)