From 8ba567929c8c240870d51a8e6fb6ee34d23498a8 Mon Sep 17 00:00:00 2001
From: Kris Maglione <jg@suckless.org>
Date: Mon, 26 Feb 2007 16:04:04 -0500
Subject: [PATCH] Don't link wmii9menu against libixp.

---
 Makefile  | 9 +++++----
 config.mk | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b0a5e3fb..d9446b22 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ MAN1 = wmii wmiir wmiiwm wmiiloop
 SCRIPTS = wmii wmiir wmiiloop
 BIN = wmiiwm wmii9menu
 
-all: options wmiiwm wmii9menu
+all: options ${BIN}
 
 options:
 	@echo wmii build options:
@@ -33,11 +33,12 @@ config.mk: .hg/00changelog.i
 
 ${OBJ}: wmii.h config.mk
 
+9menu.o: config.mk
+
 wmiiwm: ${OBJ}
 	@echo LD $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@${CC} -o $@ ${OBJ} ${LDFLAGS} ${LIBIXP}
 
-# XXX: This doesn't need libixp
 wmii9menu: 9menu.o
 	@echo LD $@
 	@${CC} -o $@ 9menu.o ${LDFLAGS}
@@ -50,7 +51,7 @@ dist: clean
 	@echo creating dist tarball
 	@mkdir -p wmii-${VERSION}
 	@cp -R LICENSE Makefile README wmii wmiir config.mk rc \
-		wmii.1 wmiir.1 wmiiwm.1 wmii.h ${SRC} wmii-${VERSION}
+		wmii.1 wmiir.1 wmiiwm.1 wmii.h ${SRC} 9menu.c wmii-${VERSION}
 	@tar -cf wmii-${VERSION}.tar wmii-${VERSION}
 	@gzip wmii-${VERSION}.tar
 	@rm -rf wmii-${VERSION}
diff --git a/config.mk b/config.mk
index 9793aae8..47f3ac8f 100644
--- a/config.mk
+++ b/config.mk
@@ -15,7 +15,8 @@ X11LIB = /usr/X11R6/lib
 
 # includes and libs
 INCS = -I. -I${PREFIX}/include -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lX11 -L${PREFIX}/lib -lixp
+LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lX11
+LIBIXP = -L${PREFIX}/lib -lixp
 
 # flags
 #CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"