diff options
| author | Michael Stapelberg <michael@stapelberg.de> | 2011-07-13 16:56:27 +0200 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2011-07-13 16:56:27 +0200 |
| commit | 4b9a1c94ab8bf6e824c16bdee9b56fc0c0ee8799 (patch) | |
| tree | 8b8be67c1ce73659127f0d55a04c6d30266a31a4 /Makefile | |
| parent | e03e93fd1bb6f347b13d42796c1f0dada4ca8bb5 (diff) | |
makefile: respect and use CPPFLAGS / LIBS (Thanks Kacper)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -2,7 +2,7 @@ INSTALL=install PREFIX=/usr SYSCONFDIR=/etc -# Check if pkg-config is installed, we need it for building CFLAGS/LDFLAGS +# Check if pkg-config is installed, we need it for building CFLAGS/LIBS ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1) $(error "pkg-config was not found") endif @@ -10,30 +10,30 @@ endif CFLAGS += -std=c99 CFLAGS += -pipe CFLAGS += -Wall -CFLAGS += -D_GNU_SOURCE +CPPFLAGS += -D_GNU_SOURCE ifndef NOLIBCAIRO CFLAGS += $(shell pkg-config --cflags cairo xcb-keysyms xcb-dpms) -LDFLAGS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-image) +LIBS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-image) else -CFLAGS += -DNOLIBCAIRO +CPPFLAGS += -DNOLIBCAIRO CFLAGS += $(shell pkg-config --cflags xcb-keysyms xcb-dpms) -LDFLAGS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image) +LIBS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image) endif -LDFLAGS += -lpam +LIBS += -lpam FILES:=$(wildcard *.c) FILES:=$(FILES:.c=.o) VERSION:=$(shell git describe --tags --abbrev=0) GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))" -CFLAGS += -DVERSION=\"${GIT_VERSION}\" +CPPFLAGS += -DVERSION=\"${GIT_VERSION}\" .PHONY: install clean uninstall all: i3lock i3lock: ${FILES} - $(CC) -o $@ $^ $(LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) clean: rm -f i3lock ${FILES} i3lock-${VERSION}.tar.gz |