Merge tag '20130209-2' into debianization

20130209-2

1 files changed, 19 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index e9f1358..73ccb76 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,29 @@
-VERSION=20110818
+VERSION=20130209-2
 DIST=mcwm-$(VERSION)
-SRC=mcwm.c list.c config.h events.h list.h
-DISTFILES=LICENSE Makefile NEWS README TODO WISHLIST mcwm.man $(SRC)
+SRC=mcwm.c list.c config.h events.h list.h hidden.c
+DISTFILES=LICENSE Makefile NEWS README TODO WISHLIST mcwm.man hidden.man scripts $(SRC)
 
-CC=gcc
-CFLAGS=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include #-DDEBUG #-DDMALLOC
-LDFLAGS=-L/usr/local/lib -lxcb -lxcb-randr -lxcb-keysyms -lxcb-icccm \
-	-lxcb-atom #-ldmalloc
+CFLAGS+=-g -std=c99 -Wall -Wextra -I/usr/local/include #-DDEBUG #-DDMALLOC
+LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-randr -lxcb-keysyms -lxcb-icccm \
+	-lxcb-util #-ldmalloc
 
 RM=/bin/rm
 PREFIX=$(DESTDIR)
 
-TARGETS=mcwm
+TARGETS=mcwm hidden
 OBJS=mcwm.o list.o
 
 all: $(TARGETS)
 
 mcwm: $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@
+
+hidden: hidden.c
+	$(CC) $(CFLAGS) hidden.c $(LDFLAGS) -o $@
 
 mcwm-static: $(OBJS)
-	$(CC) -o $@ $(OBJS) -static $(CFLAGS) $(LDFLAGS) \
-	-lxcb-property -lxcb-event -lXau -lXdmcp
+	$(CC) $(OBJS) -static $(CFLAGS) $(LDFLAGS) \
+	-lXau -lXdmcp -o $@
 
 mcwm.o: mcwm.c events.h list.h config.h Makefile
 
@@ -31,14 +33,19 @@ install: $(TARGETS)
 	install -m 755 mcwm $(PREFIX)/bin
 	install -m 755 -d $(PREFIX)/man/man1/
 	install -m 644 mcwm.man $(PREFIX)/man/man1/mcwm.1
+	install -m 755 hidden $(PREFIX)/bin
+	install -m 644 hidden.man $(PREFIX)/man/man1/hidden.1
 
+uninstall: deinstall
 deinstall:
 	$(RM) $(PREFIX)/bin/mcwm
 	$(RM) $(PREFIX)/man/man1/mcwm.1
+	$(RM) $(PREFIX)/bin/hidden
+	$(RM) $(PREFIX)/man/man1/hidden.1
 
 $(DIST).tar.bz2:
 	mkdir $(DIST)
-	cp $(DISTFILES) $(DIST)/
+	cp -r $(DISTFILES) $(DIST)/
 	tar cf $(DIST).tar --exclude .git $(DIST)
 	bzip2 -9 $(DIST).tar
 	$(RM) -rf $(DIST)