nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Sascha Kruse 2012-12-11 01:17:22 +01:00
commit db60c47226
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config.mk
View File

@ -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 # paths
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = ${PREFIX}/share/man MANPREFIX = ${PREFIX}/share/man
@ -22,8 +8,6 @@ ifeq ('',$(VERSION))
VERSION := $(shell git describe) VERSION := $(shell git describe)
endif endif
XFTLIBS = -lXft
# Xinerama, comment if you don't want it # Xinerama, comment if you don't want it
XINERAMALIBS = -lXinerama XINERAMALIBS = -lXinerama
XINERAMAFLAGS = -DXINERAMA XINERAMAFLAGS = -DXINERAMA
@ -36,8 +20,8 @@ XINERAMAFLAGS = -DXINERAMA
INIFLAGS = -DINI_ALLOW_MULTILINE=0 INIFLAGS = -DINI_ALLOW_MULTILINE=0
# includes and libs # includes and libs
INCS = -I${X11INC} $(shell pkg-config --cflags dbus-1 libxdg-basedir) ${XFTINC} INCS = $(shell pkg-config --cflags dbus-1 libxdg-basedir x11 freetype2 xext xft xscrnsaver)
LIBS = -lm -L${X11LIB} -lX11 -lXss ${XFTLIBS} ${XINERAMALIBS} $(shell pkg-config --libs dbus-1 libxdg-basedir) LIBS = -lm -L${X11LIB} -lXss ${XINERAMALIBS} $(shell pkg-config --libs dbus-1 libxdg-basedir x11 freetype2 xext xft xscrnsaver)
# flags # flags
CPPFLAGS += -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${INIFLAGS} CPPFLAGS += -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${INIFLAGS}