From 2aeda38ba5968abdb0247631e59119386d95d3b9 Mon Sep 17 00:00:00 2001
From: uriel <uriel@localhost.localdomain>
Date: Sat, 17 Dec 2005 12:46:05 +0100
Subject: [PATCH] Makefile cleanups

Remove many superfluous vars from config.mk
---
 Makefile     | 25 +++++++++++--------------
 cmd/Makefile |  4 ++--
 config.mk    | 13 ++++---------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index f536b663..7becbcec 100644
--- a/Makefile
+++ b/Makefile
@@ -14,26 +14,24 @@ MAN1 = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmiibar.1 cmd/wmiifs.1 \
 all:
 	@echo wmii build options:
 	@echo "LIBS     = ${LIBS}"
-	@echo "INCLUDES = ${INCLUDES}"
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 	@for i in ${SUBDIRS} cmd/wm; do \
-		(cd $$i; ${MAKE}); \
+		(cd $$i; make;) \
 	done
 
 dist: clean
-	@mkdir -p wmii-${VERSION}
-	@cp -R Makefile README LICENSE config.mk rc ${SUBDIRS} extra doc wmii-${VERSION}
-	@tar -cf wmii-${VERSION}.tar wmii-${VERSION}
-	@gzip wmii-${VERSION}.tar
-	@rm -rf wmii-${VERSION}
-	@echo created distribution wmii-${VERSION}.tar.gz
+	mkdir -p wmii-${VERSION}
+	cp -R Makefile README LICENSE config.mk rc ${SUBDIRS} extra doc wmii-${VERSION}
+	tar -cf wmii-${VERSION}.tar wmii-${VERSION}
+	gzip wmii-${VERSION}.tar
+	rm -rf wmii-${VERSION}
 
 clean:
 	rm -f *.o
-	@for i in ${SUBDIRS} cmd/wm; do \
-		(cd $$i; ${MAKE} clean); \
+	for i in ${SUBDIRS} cmd/wm; do \
+		(cd $$i; make clean); \
 	done
 	rm -rf wmii-${VERSION}*
 
@@ -60,11 +58,10 @@ install: all
 	@echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
 
 uninstall:
-	@for i in ${BIN}; do \
+	for i in ${BIN}; do \
 		rm -f ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
 	done
-	@for i in ${MAN1}; do \
+	for i in ${MAN1}; do \
 		rm -f ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
 	done
-	@rm -rf ${DESTDIR}${CONFPREFIX}/wmii-3
-	@echo "uninstalled wmii"
+	rm -rf ${DESTDIR}${CONFPREFIX}/wmii-3
diff --git a/cmd/Makefile b/cmd/Makefile
index bbfbee22..d6ac2c4b 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -57,12 +57,12 @@ wmiimenu: ${OBJ_menu}
 
 wmiir2: ${OBJ_r2}
 	@echo LD $@
-	@${CC} -o $@ ${OBJ_r2} -g -static -L${LIBDIR} -L/usr/lib -lc \
+	@${CC} -o $@ ${OBJ_r2} -g -static -L${PREFIX}/lib -L/usr/lib -lc \
 		-L../libixp2 -lixp -L../libcext -lcext
 
 wmiir: ${OBJ_r}
 	@echo LD $@
-	@${CC} -o $@ ${OBJ_r} -g -static -L${LIBDIR} -L/usr/lib -lc \
+	@${CC} -o $@ ${OBJ_r} -g -static -L${PREFIX}/lib -L/usr/lib -lc \
 		-L../libixp -lixp -L../libcext -lcext
 
 wmiifs: ${OBJ_fs}
diff --git a/config.mk b/config.mk
index 19b5b668..453882df 100644
--- a/config.mk
+++ b/config.mk
@@ -6,25 +6,20 @@ CONFPREFIX = ${PREFIX}/etc
 MANPREFIX = ${PREFIX}/share/man
 9PREFIX = ${PREFIX}/9
 
-INCDIR = ${PREFIX}/include
-LIBDIR = ${PREFIX}/lib
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 VERSION = 3-current
 
 # includes and libs
-INCLUDES = -I. -I${INCDIR} -I/usr/include -I${X11INC}
-LIBS = -L${LIBDIR} -L/usr/lib -lc -lm -L${X11LIB} -lX11
+LIBS = -L${PREFIX}/lib -L/usr/lib -lc -lm -L${X11LIB} -lX11
 
 # flags
-CFLAGS = -O0 -g -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
-#CFLAGS = -O0 -g -Wall -W ${INCLUDES} -DVERSION=\"${VERSION}\"
+# Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
+CFLAGS = -g -Wall -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+	-DVERSION=\"${VERSION}\"
 LDFLAGS = -g ${LIBS}
 
-# compiler
-# Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
-MAKE = make
 AR = ar cr
 CC = cc
 RANLIB = ranlib