Add floating layer

[wmpus] / makefile

diff --git a/makefile b/makefile
index a3f9952d5e11cf88f1e9e19626a0e69d20f89fd3..b7a1e8c366fbd19ea9ef34c616ea20da4b050b17 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,32 +1,26 @@
-WM=wmii
+WM     ?= wmii
+SYS    ?= x11
+CFLAGS ?= -g -Wall -Werror
 
-SYS=x11
-CC=gcc
-PROG=awm
-CFLAGS=-g -Werror -Wall
-LIBS=-Wl,--as-needed -lX11
-TEST=DISPLAY=:2.0
-
-ifdef WIN32
-SYS=win32
-CC=i686-pc-mingw32-gcc
-CFLAGS=-g -Werror -Wall
-LIBS=
-PROG=awm.exe
-TEST=wine
+ifeq ($(SYS),x11)
+CC      = gcc
+LIBS   += -lX11 -lXinerama
+PROG    = wmpus
 endif
 
-test: $(PROG)
-       $(TEST) ./$<
+ifeq ($(SYS),win32)
+CC      = i686-pc-mingw32-gcc
+CFLAGS += -D_NO_OLDNAMES -DMARGIN=15
+PROG    = wmpus.exe
+endif
 
-debug: $(PROG)
-       $(TEST) gdb ./$<
+include config.mk
 
 $(PROG): main.o util.o sys-$(SYS).o wm-$(WM).o
        $(CC) $(CFLAGS) -o $@ $+ $(LIBS)
 
-%.o: %.c $(wildcard *.h)
+%.o: %.c $(wildcard *.h) makefile
        $(CC) --std=gnu99 $(CFLAGS) -c -o $@ $<
 
 clean:
-       rm -f $(PROG) *.o
+       rm -f wmpus *.exe *.o