X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=4900ee57be91ce841559a82000438fd35a726469;hb=bcf8984f9b78949a7f33b2771800e67a538caddc;hp=ff5ded716d839d573c4237297245cf1ea5449b5f;hpb=8c3a527e337ac76beac38131ff1accdf8312d09e;p=wmpus

diff --git a/makefile b/makefile
index ff5ded7..4900ee5 100644
--- a/makefile
+++ b/makefile
@@ -1,17 +1,21 @@
 WM=wmii
 
-#SYS=x11
-#CC=gcc
-#PROG=awm
-#CFLAGS=-g -Wall -Os
-#LIBS=-Wl,--as-needed -lX11
-#TEST=DISPLAY=:2.0
+SYS=x11
+CC=gcc
+PROG=awm
+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 -Wall
+CFLAGS=-g -Werror -Wall -D_NO_OLDNAMES
+LIBS=
 PROG=awm.exe
-TEST=wine
+TEST=cp -t /t/htdocs/temp
+endif
 
 test: $(PROG)
 	$(TEST) ./$<
@@ -22,7 +26,7 @@ debug: $(PROG)
 $(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: