nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

common.mk: Silence some remaining pkg-config calls. 

Some pkg-config calls still didn't redirect stderr to /dev/null, causing
the gnome-config error messages to be printed.
This commit is contained in:
Raphael Kubo da Costa 2011-10-09 18:35:58 -03:00 committed by Michael Stapelberg
parent c5e9527abc
commit 99825ff268
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -31,7 +31,7 @@ endif
# We redirect stderr to /dev/null because pkg-config prints an error if support # We redirect stderr to /dev/null because pkg-config prints an error if support
# for gnome-config was enabled but gnome-config is not actually installed. # for gnome-config was enabled but gnome-config is not actually installed.
cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null) cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null)
ldflags_for_lib = $(shell pkg-config --exists $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2)) ldflags_for_lib = $(shell pkg-config --exists 2>/dev/null $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
CFLAGS += -std=c99 CFLAGS += -std=c99
CFLAGS += -pipe CFLAGS += -pipe
@ -61,7 +61,7 @@ CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\" CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\" CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
ifeq ($(shell pkg-config --atleast-version=8.10 libpcre && echo 1),1) ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
CPPFLAGS += -DPCRE_HAS_UCP=1 CPPFLAGS += -DPCRE_HAS_UCP=1
endif endif