X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=makefile;h=b7a1e8c366fbd19ea9ef34c616ea20da4b050b17;hp=772d99946bc420b93c72c6128e0ccb14a4a80ce4;hb=bdfa912aef69869a2385d65d5e8486080fc66895;hpb=ee556f1413d9da165fd6ea74f0bf4039ab28da0d

diff --git a/makefile b/makefile
index 772d999..b7a1e8c 100644
--- a/makefile
+++ b/makefile
@@ -1,31 +1,26 @@
-WM=wmii
+WM     ?= wmii
+SYS    ?= x11
+CFLAGS ?= -g -Wall -Werror
 
-SYS=x11
-CC=gcc
-PROG=awm
-CFLAGS=-g -Wall -Os
-LIBS=-Wl,--as-needed -lX11
-TEST=DISPLAY=:2.0
-
-ifdef WIN32
-SYS=win32
-CC=i686-pc-mingw32-gcc
-CFLAGS=-g -Wall
-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