common.mk: Little reordering

This commit is contained in:
Quentin Glidic 2012-07-23 00:13:16 +02:00
parent 0b4ee7a1da
commit eb66337020
1 changed files with 2 additions and 3 deletions

View File

@ -63,9 +63,6 @@ endif
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 2>/dev/null $(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))
LIBS += -L $(TOPDIR) -li3
# XCB common stuff # XCB common stuff
XCB_CFLAGS := $(call cflags_for_lib, xcb) XCB_CFLAGS := $(call cflags_for_lib, xcb)
XCB_CFLAGS += $(call cflags_for_lib, xcb-event) XCB_CFLAGS += $(call cflags_for_lib, xcb-event)
@ -123,6 +120,8 @@ PCRE_LIBS := $(call ldflags_for_lib, libpcre,pcre)
LIBSN_CFLAGS := $(call cflags_for_lib, libstartup-notification-1.0) LIBSN_CFLAGS := $(call cflags_for_lib, libstartup-notification-1.0)
LIBSN_LIBS := $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1) LIBSN_LIBS := $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
# libi3
LIBS = -L$(TOPDIR) -li3
## Platform-specific flags ## Platform-specific flags