diff --git a/cmd/Makefile b/cmd/Makefile
index d296acc5..e60b0564 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -6,43 +6,20 @@ include ../config.mk
 CFLAGS += -I../liblitz -I../libixp -I../libcext
 LDFLAGS += -L../liblitz -llitz -L../libixp -lixp -L../libcext -lcext
 
-SRC_menu = wmiimenu.c
-OBJ_menu = ${SRC_menu:.c=.o}
+SRC = wmiimenu.c wmiipsel.c wmiir.c
+OBJ = ${SRC:.c=.o}
 
-SRC_r = wmiir.c
-OBJ_r = ${SRC_r:.c=.o}
-
-SRC_psel = wmiipsel.c
-OBJ_psel = ${SRC_psel:.c=.o}
-
-all: wmiimenu wmiir wmiipsel
+all: ${OBJ}
 	@echo built wmii commands
 
 .c.o:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
+	@echo LD $*
+	@${CC} -o $* $*.o ${LDFLAGS}
 
-wmiimenu: ${OBJ_menu}
-	@echo LD $@
-	@${CC} -o $@ ${OBJ_menu} ${LDFLAGS}
 # Solaris
-#	@${CC} -o $@ ${OBJ_menu} ${LDFLAGS} -lsocket
-
-wmiir: ${OBJ_r}
-	@echo LD $@
-	@${CC} -o $@ ${OBJ_r} -g -L${PREFIX}/lib -L/usr/lib -lc \
-		-L../libixp -lixp -L../libcext -lcext
-# Solaris
-#	@${CC} -o $@ ${OBJ_r} -g -static -L${PREFIX}/lib -L/usr/lib -lc \
-#		-L../libixp -lixp -L../libcext -lcext -lsocket
-
-wmiipsel: ${OBJ_psel}
-	@echo LD $@
-	@${CC} -o $@ ${OBJ_psel} ${LDFLAGS}
-
-wmiiwarp: ${OBJ_warp}
-	@echo LD $@
-	@${CC} -o $@ ${OBJ_warp} ${LDFLAGS}
+#	@${CC} -o $* $*.o ${LDFLAGS} -lsocket
 
 clean:
 	rm -f wmiimenu wmiir wmiipsel wmiiwarp *.o