mid-kid
/
i3lock-color
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

makefile: respect and use CPPFLAGS / LIBS (Thanks Kacper)

master
Michael Stapelberg 14 years ago
parent
e03e93fd1b
commit
4b9a1c94ab
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      Makefile

16
Makefile
View File

@ -2,7 +2,7 @@ INSTALL=install
PREFIX=/usr PREFIX=/usr
SYSCONFDIR=/etc 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) ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
$(error "pkg-config was not found") $(error "pkg-config was not found")
endif endif
@ -10,30 +10,30 @@ endif
CFLAGS += -std=c99 CFLAGS += -std=c99
CFLAGS += -pipe CFLAGS += -pipe
CFLAGS += -Wall CFLAGS += -Wall
CFLAGS += -D_GNU_SOURCE CPPFLAGS += -D_GNU_SOURCE
ifndef NOLIBCAIRO ifndef NOLIBCAIRO
CFLAGS += $(shell pkg-config --cflags cairo xcb-keysyms xcb-dpms) 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 else
CFLAGS += -DNOLIBCAIRO CPPFLAGS += -DNOLIBCAIRO
CFLAGS += $(shell pkg-config --cflags xcb-keysyms xcb-dpms) 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 endif
LDFLAGS += -lpam LIBS += -lpam
FILES:=$(wildcard *.c) FILES:=$(wildcard *.c)
FILES:=$(FILES:.c=.o) FILES:=$(FILES:.c=.o)
VERSION:=$(shell git describe --tags --abbrev=0) VERSION:=$(shell git describe --tags --abbrev=0)
GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))" 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 .PHONY: install clean uninstall
all: i3lock all: i3lock
i3lock: ${FILES} i3lock: ${FILES}
$(CC) -o $@ $^ $(LDFLAGS) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
clean: clean:
rm -f i3lock ${FILES} i3lock-${VERSION}.tar.gz rm -f i3lock ${FILES} i3lock-${VERSION}.tar.gz

Write Preview
Loading…
Cancel
Save