Update

[dwm.git] / Makefile

diff --git a/Makefile b/Makefile
index b139b544f91a86994ca125a229540e13ea7ab25a..9ae64c58cb0d5a6f46f188ca068c51311dbfcc83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = dwm.c
+SRC = drw.c dwm.c util.c
 OBJ = ${SRC:.c=.o}
 
 all: options dwm
@@ -15,46 +15,34 @@ options:
        @echo "CC       = ${CC}"
 
 .c.o:
-       @echo CC $<
-       @${CC} -c ${CFLAGS} $<
+       ${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk
 
-config.h:
-       @echo creating $@ from config.def.h
-       @cp config.def.h $@
-
 dwm: ${OBJ}
-       @echo CC -o $@
-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
+       ${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
-       @echo cleaning
-       @rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
+       rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
 
 dist: clean
-       @echo creating dist tarball
-       @mkdir -p dwm-${VERSION}
-       @cp -R LICENSE Makefile README config.def.h config.mk \
-               dwm.1 ${SRC} dwm-${VERSION}
-       @tar -cf dwm-${VERSION}.tar dwm-${VERSION}
-       @gzip dwm-${VERSION}.tar
-       @rm -rf dwm-${VERSION}
+       mkdir -p dwm-${VERSION}
+       cp -R LICENSE Makefile README config.mk\
+               dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION}
+       tar -cf dwm-${VERSION}.tar dwm-${VERSION}
+       gzip dwm-${VERSION}.tar
+       rm -rf dwm-${VERSION}
 
 install: all
-       @echo installing executable file to ${DESTDIR}${PREFIX}/bin
-       @mkdir -p ${DESTDIR}${PREFIX}/bin
-       @cp -f dwm ${DESTDIR}${PREFIX}/bin
-       @chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
-       @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-       @sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
-       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
+       mkdir -p ${DESTDIR}${PREFIX}/bin
+       cp -f dwm ${DESTDIR}${PREFIX}/bin
+       chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
+       mkdir -p ${DESTDIR}${MANPREFIX}/man1
+       sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
+       chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 
 uninstall:
-       @echo removing executable file from ${DESTDIR}${PREFIX}/bin
-       @rm -f ${DESTDIR}${PREFIX}/bin/dwm
-       @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-       @rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1
+       rm -f ${DESTDIR}${PREFIX}/bin/dwm\
+               ${DESTDIR}${MANPREFIX}/man1/dwm.1
 
 .PHONY: all options clean dist install uninstall