Merge branch 'master' into next

[i3/i3] / libi3 / libi3.mk

diff --git a/libi3/libi3.mk b/libi3/libi3.mk
index 6f6bf506ba92d7978c1752b661b87cc4c1e56793..965e3e49ebd04a5a48624f5812f0b8d5b0b8008d 100644 (file)
--- a/libi3/libi3.mk
+++ b/libi3/libi3.mk
@@ -2,7 +2,7 @@ CLEAN_TARGETS += clean-libi3
 
 libi3_SOURCES := $(wildcard libi3/*.c)
 libi3_HEADERS := $(wildcard libi3/*.h)
-libi3_CFLAGS   =
+libi3_CFLAGS   = $(PANGO_CFLAGS)
 libi3_LIBS     =
 
 libi3_OBJECTS := $(libi3_SOURCES:.c=.o)
@@ -10,12 +10,12 @@ libi3_OBJECTS := $(libi3_SOURCES:.c=.o)
 
 libi3/%.o: libi3/%.c $(libi3_HEADERS)
        echo "[libi3] CC $<"
-       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(libi3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
+       $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(libi3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
 
 libi3.a: $(libi3_OBJECTS)
        echo "[libi3] AR libi3.a"
-       ar rcs $@ $^ $(libi3_LIBS)
+       $(AR) rcs $@ $^ $(libi3_LIBS)
 
 clean-libi3:
        echo "[libi3] Clean"
-       rm -f $(libi3_OBJECTS) libi3.a
+       rm -f $(libi3_OBJECTS) libi3/libi3.a libi3.a