pinosaur
/
surf.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
16beb6f
)
Use pkg-config for X11{INC,LIB}
author
Leonardo Taccari
<iamleot@gmail.com>
Tue, 9 Oct 2018 19:30:52 +0000
(21:30 +0200)
committer
Quentin Rameau
<quinq@fifth.space>
Tue, 9 Oct 2018 19:50:20 +0000
(21:50 +0200)
config.mk
patch
|
blob
|
history
diff --git
a/config.mk
b/config.mk
index
2cb1bd4
..
fa22f30
100644
(file)
--- a/
config.mk
+++ b/
config.mk
@@
-9,8
+9,8
@@
MANPREFIX = $(PREFIX)/share/man
LIBPREFIX = $(PREFIX)/lib
LIBDIR = $(LIBPREFIX)/surf
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 gcr-3 webkit2gtk-4.0`
GTKLIB = `pkg-config --libs 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`
@@
-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`
# includes and libs
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
+INCS = $(X11INC) $(GTKINC)
+LIBS =
$(X11LIB)
$(GTKLIB) -lgthread-2.0
# flags
CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \
# flags
CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \