wmii

commit b2c7eef97651dff99c2dba8c7c554c01b7f03b9c
parent edd7dba67a19d53d5bcbed944fbafc8223bdbfe6
Author: Kris Maglione <jg@suckless.org>
Date:   Mon, 26 Feb 2007 04:46:55 -0500

Fix 9menu function, compile wmii9menu with 9menu.o instead of ${OBJ}, some minor 9menu.c modifications.

Diffstat:
Makefile
 | 
7
+++----
rc/rc.wmii
 | 
3
+--

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -37,9 +37,9 @@ wmiiwm: ${OBJ}
 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 # XXX: This doesn't need libixp
-wmii9menu: 9menu.c
+wmii9menu: 9menu.o
 	@echo LD $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@${CC} -o $@ 9menu.o ${LDFLAGS}
 
 clean:
 	@echo cleaning
@@ -80,8 +80,7 @@ install: all
 
 uninstall:
 	@echo removing executable files from ${DESTDIR}${PREFIX}/bin
-	@cd ${DESTDIR}${PREFIX}/bin && rm -f ${SCRIPTS}
-	@rm -f ${DESTDIR}${PREFIX}/bin/wmiiwm
+	@cd ${DESTDIR}${PREFIX}/bin && rm -f ${SCRIPTS} ${BIN}
 	@echo removing scripts from ${DESTDIR}${CONFPREFIX}/wmii-${CONFVERSION}
 	@rm -rf ${DESTDIR}${CONFPREFIX}/wmii-${CONFVERSION}
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
diff --git a/rc/rc.wmii b/rc/rc.wmii
@@ -24,7 +24,7 @@ fn wmiimenu {
 }
 
 fn 9menu {
-	./9menu -teleport -font $WMII_FONT \
+	wmii9menu -teleport -font $WMII_FONT \
 		-nf $WMII_NORMCOLORS(1) -nb $WMII_NORMCOLORS(2) \
 		-sf $WMII_FOCUSCOLORS(1) -sb $WMII_FOCUSCOLORS(2) \
 		-br $WMII_FOCUSCOLORS(3) $*
@@ -80,7 +80,6 @@ fn Event-NotUrgentTag { shift; wmiir xwrite /lbar/$"* $"* }
 fn Event-LeftBarClick { shift; wmiir xwrite /ctl view $* }
 fn Event-ClientMouseDown {
 	client = $1; button = $2
-	echo ClientMouseDown $*
 	if(~ $button 3)
 		switch(`{9menu Delete Nop}) {
 		case Delete