X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=f9ad109ee7f1f5bc8d4379a3d49e958b80b57f13;hb=20508b0053a5925ca15f17813ca9176659d06ae1;hp=2920b48ab26cde0acd3004dfd30a3c12c6a89f1f;hpb=68b7ef11fe9910511d223bd80ac9bbd38456536c;p=wmpus

diff --git a/makefile b/makefile
index 2920b48..f9ad109 100644
--- a/makefile
+++ b/makefile
@@ -1,33 +1,27 @@
-WM=wmii
+WM     ?= wmii
+SYS    ?= x11
+CFLAGS ?= -g -Wall -Werror
 
-SYS=x11
-CC=gcc
-PROG=wmpus
-CFLAGS=-g -Werror -Wall
-LIBS=-Wl,--as-needed -lX11 -lXinerama
-TEST=DISPLAY=:2.0
-
-WIN32?=
-ifdef WIN32
-SYS=win32
-CC=i686-pc-mingw32-gcc
-CFLAGS=-g -Werror -Wall -D_NO_OLDNAMES -DMARGIN=15
-LIBS=
-PROG=wmpus.exe
-TEST=cp -t /t/htdocs/temp
+ifeq ($(SYS),x11)
+CC      = gcc
+LIBS   += -lX11 -lXinerama
+PROG    = wmpus
 endif
 
-test: $(PROG)
-	$(TEST) ./$<
+ifeq ($(SYS),win32)
+CC      = i686-pc-mingw32-gcc
+CFLAGS += -D_MODE_T_
+LIBS   += -lgdi32
+PROG    = wmpus.exe
+endif
 
-debug: $(PROG)
-	$(TEST) gdb ./$<
+include config.mk
 
-$(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) makefile
 	$(CC) --std=gnu99 $(CFLAGS) -c -o $@ $<
 
 clean:
-	rm -f $(PROG) *.o
+	rm -f wmpus *.exe *.o