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

remove hard-coded paths since we now use pkg-config for all the dependencies

This commit is contained in:
Michael Stapelberg 2011-03-18 18:11:02 +01:00
parent 696d3cb88f
commit a2e87f69ac
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@ -27,7 +27,6 @@ CFLAGS += -Wall
# We don’t want unused-parameter because of the use of many callbacks # We don’t want unused-parameter because of the use of many callbacks
CFLAGS += -Wunused-value CFLAGS += -Wunused-value
CFLAGS += -Iinclude CFLAGS += -Iinclude
CFLAGS += -I/usr/local/include
CFLAGS += $(call cflags_for_lib, xcb-keysyms) CFLAGS += $(call cflags_for_lib, xcb-keysyms)
ifeq ($(shell pkg-config --exists xcb-util || echo 1),1) ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
CFLAGS += -DXCB_COMPAT CFLAGS += -DXCB_COMPAT
@ -64,7 +63,6 @@ LDFLAGS += $(call ldflags_for_lib, xcursor, Xcursor)
LDFLAGS += $(call ldflags_for_lib, x11, X11) LDFLAGS += $(call ldflags_for_lib, x11, X11)
LDFLAGS += $(call ldflags_for_lib, yajl, yajl) LDFLAGS += $(call ldflags_for_lib, yajl, yajl)
LDFLAGS += $(call ldflags_for_lib, libev, ev) LDFLAGS += $(call ldflags_for_lib, libev, ev)
LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
ifeq ($(UNAME),NetBSD) ifeq ($(UNAME),NetBSD)
# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv # We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv