X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=c020215e22fd6107d224707da1457c1971ec779f;hb=88e2a1773e458b1f79e2e743e3d5bdc659caf822;hp=5cbe8fb41ff11097fecd65864c44645cabcb4765;hpb=d7d862c402564b4fe29f17e1a55cdbb2967aa6fd;p=wmpus

diff --git a/makefile b/makefile
index 5cbe8fb..c020215 100644
--- a/makefile
+++ b/makefile
@@ -1,29 +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
+ifeq ($(SYS),x11)
+CC      = gcc
+LIBS   += -lX11 -lXinerama
+PROG    = wmpus
+endif
 
-#SYS=win32
-#CC=i686-pc-mingw32-gcc
-#CFLAGS=-g -Wall
-#PROG=awm.exe
-#TEST=wine
+ifeq ($(SYS),win32)
+CC      = i686-pc-mingw32-gcc
+CFLAGS += -D_MODE_T_ -DMARGIN=15
+PROG    = wmpus.exe
+endif
 
-test: $(PROG)
-	$(TEST) ./$<
+include config.mk
 
-debug: $(PROG)
-	$(TEST) gdb ./$<
-
-$(PROG): main.o util.o sys-$(SYS).o wm-$(WM).o
+$(PROG): main.o conf.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