dots
/
surf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use pkg-config for X11{INC,LIB}

This commit is contained in:
Leonardo Taccari 2018-10-09 21:30:52 +02:00 committed by Quentin Rameau
parent 16beb6f8ac
commit 2b71a22755
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.mk
View File

@ -9,8 +9,8 @@ MANPREFIX = $(PREFIX)/share/man
LIBPREFIX = $(PREFIX)/lib LIBPREFIX = $(PREFIX)/lib
LIBDIR = $(LIBPREFIX)/surf LIBDIR = $(LIBPREFIX)/surf
X11INC = /usr/X11R6/include X11INC = `pkg-config --cflags x11`
X11LIB = /usr/X11R6/lib X11LIB = `pkg-config --libs x11`
GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 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` GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
@ -18,8 +18,8 @@ WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
WEBEXTLIBS = `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 # includes and libs
INCS = -I$(X11INC) $(GTKINC) INCS = $(X11INC) $(GTKINC)
LIBS = -L$(X11LIB) -lX11 $(GTKLIB) -lgthread-2.0 LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
# flags # flags
CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \ CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \