Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2013-03-14 15:20:34 +01:00
commit c488bf7a76
1 changed files with 1 additions and 1 deletions

View File

@ -4,7 +4,7 @@ CLEAN_TARGETS += clean-i3-msg
i3_msg_SOURCES := $(wildcard i3-msg/*.c) i3_msg_SOURCES := $(wildcard i3-msg/*.c)
i3_msg_HEADERS := $(wildcard i3-msg/*.h) i3_msg_HEADERS := $(wildcard i3-msg/*.h)
i3_msg_CFLAGS = $(XCB_CFLAGS) $(PANGO_CFLAGS) i3_msg_CFLAGS = $(XCB_CFLAGS) $(PANGO_CFLAGS) $(YAJL_CFLAGS)
i3_msg_LIBS = $(XCB_LIBS) $(YAJL_LIBS) i3_msg_LIBS = $(XCB_LIBS) $(YAJL_LIBS)
i3_msg_OBJECTS := $(i3_msg_SOURCES:.c=.o) i3_msg_OBJECTS := $(i3_msg_SOURCES:.c=.o)