Bugfix: Reconfigure all clients in stacking, correctly ignore events, event when...

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 9e919dc82c51ce8294f1ec4521aec47dc4f15d96..eb806d961088fb31fe70a115f1b137410133d513 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,53 @@
 UNAME=$(shell uname)
+DEBUG=1
+INSTALL=install
 
+CFLAGS += -std=c99
+CFLAGS += -pipe
 CFLAGS += -Wall
-# Extended debugging flags, macros shall be available in gcc
-CFLAGS += -gdwarf-2
-CFLAGS += -g3
-#CFLAGS += -I/usr/include/xcb
-CFLAGS += -I/usr/local/include/
-#CFLAGS += -I/usr/local/include/xcb
-CFLAGS += -I/usr/pkg/include
+CFLAGS += -Wunused
+CFLAGS += -Iinclude
+CFLAGS += -I/usr/local/include
 
 LDFLAGS += -lxcb-wm
-LDFLAGS += -lxcb-keysyms
+#LDFLAGS += -lxcb-keysyms
 LDFLAGS += -lxcb-xinerama
 LDFLAGS += -lX11
 LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
 ifeq ($(UNAME),NetBSD)
+CFLAGS += -I/usr/pkg/include
 LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
 endif
 
-FILES=$(patsubst %.c,%.o,$(wildcard *.c))
+ifeq ($(UNAME),Linux)
+CFLAGS += -D_GNU_SOURCE
+endif
+
+ifeq ($(DEBUG),1)
+# Extended debugging flags, macros shall be available in gcc
+CFLAGS += -gdwarf-2
+CFLAGS += -g3
+else
+CFLAGS += -O2
+endif
 
-%.o: %.c %.h data.h
+FILES=$(patsubst %.c,%.o,$(wildcard src/*.c))
+HEADERS=$(wildcard include/*.h)
+
+src/%.o: src/%.c ${HEADERS}
        $(CC) $(CFLAGS) -c -o $@ $<
 
 all: ${FILES}
-       $(CC) -o mainx ${FILES} $(LDFLAGS)
+       $(CC) -o i3 ${FILES} $(LDFLAGS)
+
+install: all
+       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
+       $(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
+       $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
+       $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
 
 clean:
-       rm -f *.o
+       rm -f src/*.o
+
+distclean: clean
+       rm -f i3