Add missing MAX macros, ensure that i3 can be compiled without pango

[i3/i3] / libi3 / libi3.mk

diff --git a/libi3/libi3.mk b/libi3/libi3.mk
index 9c9f3c91d2ea33939073e4f6718b142807095740..965e3e49ebd04a5a48624f5812f0b8d5b0b8008d 100644 (file)
--- a/libi3/libi3.mk
+++ b/libi3/libi3.mk
@@ -2,18 +2,20 @@ CLEAN_TARGETS += clean-libi3
 
 libi3_SOURCES := $(wildcard libi3/*.c)
 libi3_HEADERS := $(wildcard libi3/*.h)
+libi3_CFLAGS   = $(PANGO_CFLAGS)
+libi3_LIBS     =
 
 libi3_OBJECTS := $(libi3_SOURCES:.c=.o)
 
 
 libi3/%.o: libi3/%.c $(libi3_HEADERS)
        echo "[libi3] CC $<"
-       $(CC) $(CPPFLAGS) $(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 $@ $^
+       $(AR) rcs $@ $^ $(libi3_LIBS)
 
 clean-libi3:
        echo "[libi3] Clean"
-       rm -f $(libi3_OBJECTS) libi3.a
+       rm -f $(libi3_OBJECTS) libi3/libi3.a libi3.a