X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=c020215e22fd6107d224707da1457c1971ec779f;hb=d28df0d848dc7e30f2df67518a251b52981a1093;hp=c0e80da81520db7193da7793d44db3fd6a1403de;hpb=7b3b694ffaa75f719444aff110e06cd1162fcd2d;p=wmpus

diff --git a/makefile b/makefile
index c0e80da..c020215 100644
--- a/makefile
+++ b/makefile
@@ -1,33 +1,26 @@
-WM=wmii
+WM     ?= wmii
+SYS    ?= x11
+CFLAGS ?= -g -Wall -Werror
 
-SYS=x11
-CC=gcc
-PROG=awm
-CFLAGS=-g -Werror -Wall -Os
-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
-LIBS=
-PROG=awm.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_ -DMARGIN=15
+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