simplify Makefile by merging unuseful variables - surf-adblock - Surf adblock web extension
 (HTM) git clone git://git.codemadness.org/surf-adblock
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 6d7aec70618a62cba038fb4dacfc69691e3210e0
 (DIR) parent f34202b8786c190d5935210e0289123943239730
 (HTM) Author: Quentin Rameau <quinq@fifth.space>
       Date:   Sat, 16 Jul 2016 12:59:36 +0200
       
       simplify Makefile by merging unuseful variables
       
       GTK, WEBEXT, LIB separation is a leftover from surf, we can use only
       WEBEXT here.
       
       Diffstat:
         M Makefile                            |       4 ++--
         M config.mk                           |      22 ++++++++++------------
       
       2 files changed, 12 insertions(+), 14 deletions(-)
       ---
 (DIR) diff --git a/Makefile b/Makefile
       @@ -11,12 +11,12 @@ all: surf-adblock.la
                ${CC} -c ${CFLAGS} $<
        
        .c.lo:
       -        ${LIBTOOL} --mode compile --tag CC ${CC} ${LIBCFLAGS} -c $<
       +        ${LIBTOOL} --mode compile --tag CC ${CC} ${CFLAGS} -c $<
        
        ${OBJ}: config.mk
        
        surf-adblock.la: ${OBJ}
       -        ${LIBTOOL} --mode link --tag CC ${CC} ${LIB} ${LIBLDFLAGS} -o $@ \
       +        ${LIBTOOL} --mode link --tag CC ${CC} ${LIB} ${LDFLAGS} -o $@ \
                        ${OBJ} -rpath ${DESTDIR}${LIBPREFIX}
        
        clean:
 (DIR) diff --git a/config.mk b/config.mk
       @@ -10,22 +10,20 @@ LIBPREFIX = ${PREFIX}/lib/surf
        X11INC = /usr/X11R6/include
        X11LIB = /usr/X11R6/lib
        
       -GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0`
       -GTKLIB = `pkg-config --libs gtk+-3.0 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`
       +WEBEXTINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0 \
       +             webkit2gtk-web-extension-4.0`
       +WEBEXTLIB = `pkg-config --libs gtk+-3.0 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 = -I. -I/usr/include -I${X11INC} ${WEBEXTINC}
       +LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${WEBEXTLIB} -lgthread-2.0
        
        # flags
       -CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
       -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
       -LDFLAGS = -s ${LIBS}
       -LIBCPPFLAGS = -DWEBEXTDIR=\"${LIBPREFIX}\"
       -LIBCFLAGS = -std=c99 -pedantic -Wall -Os ${WEBEXTINC} ${LIBCPPFLAGS}
       -LIBLDFLAGS = -s ${WEBEXTLIB} -avoid-version
       +CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" \
       +           -D_DEFAULT_SOURCE -DWEBEXTDIR=\"${LIBPREFIX}\"
       +CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} ${WEBEXTINC}
       +LDFLAGS = -s ${LIBS} -avoid-version
        
        # compiler and linker
        CC = cc