fix compilation with older xcb-util with -DXCB_COMPAT (Thanks okraits)

[i3/i3] / i3bar / i3bar.mk

diff --git a/i3bar/i3bar.mk b/i3bar/i3bar.mk
index 988e598cb79f84ee6df5dc3d382e8b774b1caa30..067802502f28ddc31aca70b1a39a6f21545e1440 100644 (file)
--- a/i3bar/i3bar.mk
+++ b/i3bar/i3bar.mk
@@ -4,19 +4,19 @@ CLEAN_TARGETS += clean-i3bar
 
 i3bar_SOURCES := $(wildcard i3bar/src/*.c)
 i3bar_HEADERS := $(wildcard i3bar/include/*.h)
-i3bar_CFLAGS   =
-i3bar_LIBS     =
+i3bar_CFLAGS   = $(XCB_CFLAGS) $(X11_CFLAGS) $(PANGO_CFLAGS) $(YAJL_CFLAGS) $(LIBEV_CFLAGS)
+i3bar_LIBS     = $(XCB_LIBS) $(X11_LIBS) $(PANGO_LIBS) $(YAJL_LIBS) $(LIBEV_LIBS)
 
 i3bar_OBJECTS := $(i3bar_SOURCES:.c=.o)
 
 
 i3bar/src/%.o: i3bar/src/%.c $(i3bar_HEADERS)
        echo "[i3bar] CC $<"
-       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3bar_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -Ii3bar/include -c -o $@ $<
+       $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3bar_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -Ii3bar/include -c -o $@ $<
 
 i3bar/i3bar: libi3.a $(i3bar_OBJECTS)
        echo "[i3bar] Link i3bar"
-       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(i3bar_LIBS) $(LIBS)
+       $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3bar_LIBS)
 
 install-i3bar: i3bar/i3bar
        echo "[i3bar] Install"