changeset: 1968:1f00053b6722
tag: tip
user: Kris Maglione <jg_AT_suckless.org>
date: Mon Feb 26 16:04:04 2007 -0500
summary: Don't link wmii9menu against libixp.
diff -r 1ec9f18ae193 -r 1f00053b6722 Makefile
--- a/Makefile Mon Feb 26 15:56:41 2007 -0500
+++ b/Makefile Mon Feb 26 16:04:04 2007 -0500
@@ -11,7 +11,7 @@ SCRIPTS = wmii wmiir 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 -r 1ec9f18ae193 -r 1f00053b6722 config.mk
--- a/config.mk Mon Feb 26 15:56:41 2007 -0500
+++ b/config.mk Mon Feb 26 16:04:04 2007 -0500
@@ -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}\"
Received on Mon Feb 26 2007 - 22:07:56 UTC
This archive was generated by hypermail 2.2.0 : Sun Jul 13 2008 - 15:55:58 UTC