diff --git a/config.mk b/config.mk index 605008c..a300deb 100644 --- a/config.mk +++ b/config.mk @@ -1,17 +1,3 @@ -OS := $(shell uname -o) -ifeq ($(OS), GNU/Linux) - X11INC = /usr/include/X11 - X11LIB = /usr/lib/X11 -else ifeq ($(OS), FreeBSD) - X11INC = /usr/local/include - X11LIB = /usr/local/lib - XFTINC = -I${X11INC}/freetype2 -else ifeq ($(OS), OpenBSD) - X11INC = /usr/X11R6/include - X11LIB = /usr/X11R6/lib - XFTINC = -I/usr/include/freetype2 -endif - # paths PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man @@ -22,8 +8,6 @@ ifeq ('',$(VERSION)) VERSION := $(shell git describe) endif -XFTLIBS = -lXft - # Xinerama, comment if you don't want it XINERAMALIBS = -lXinerama XINERAMAFLAGS = -DXINERAMA @@ -36,8 +20,8 @@ XINERAMAFLAGS = -DXINERAMA INIFLAGS = -DINI_ALLOW_MULTILINE=0 # includes and libs -INCS = -I${X11INC} $(shell pkg-config --cflags dbus-1 libxdg-basedir) ${XFTINC} -LIBS = -lm -L${X11LIB} -lX11 -lXss ${XFTLIBS} ${XINERAMALIBS} $(shell pkg-config --libs dbus-1 libxdg-basedir) +INCS = $(shell pkg-config --cflags dbus-1 libxdg-basedir x11 freetype2 xext xft xscrnsaver) +LIBS = -lm -L${X11LIB} -lXss ${XINERAMALIBS} $(shell pkg-config --libs dbus-1 libxdg-basedir x11 freetype2 xext xft xscrnsaver) # flags CPPFLAGS += -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${INIFLAGS}