sync updated drw code from dmenu

[dwm.git] / Makefile

diff --git a/Makefile b/Makefile
index 4af6a3d..fd07d59 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # dwm - dynamic window manager
 # dwm - dynamic window manager

-#   (C)opyright MMVI-MMVII Anselm R. Garbe
+# See LICENSE file for copyright and license details.

 
 include config.mk
 
 
 include config.mk
 

-SRC = client.c event.c layout.c main.c tag.c util.c
+SRC = drw.c dwm.c util.c

 OBJ = ${SRC:.c=.o}
 
 all: options dwm
 OBJ = ${SRC:.c=.o}
 
 all: options dwm


@@ -18,16 +18,15 @@ options:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 

-${OBJ}: dwm.h config.h config.mk
+${OBJ}: config.h config.mk

 
 config.h:
 
 config.h:

-       @echo creating $@ from config.default.h
-       @cp config.default.h $@
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@

 
 dwm: ${OBJ}
        @echo CC -o $@
        @${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 dwm: ${OBJ}
        @echo CC -o $@
        @${CC} -o $@ ${OBJ} ${LDFLAGS}

-       @strip $@

 
 clean:
        @echo cleaning
 
 clean:
        @echo cleaning


@@ -36,8 +35,8 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p dwm-${VERSION}
 dist: clean
        @echo creating dist tarball
        @mkdir -p dwm-${VERSION}

-       @cp -R LICENSE Makefile README config.*.h config.mk \
-               dwm.1 dwm.h ${SRC} 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}
        @tar -cf dwm-${VERSION}.tar dwm-${VERSION}
        @gzip dwm-${VERSION}.tar
        @rm -rf dwm-${VERSION}


@@ -49,7 +48,7 @@ install: all
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
        @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
        @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
+       @sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1

        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 
 uninstall:
        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 
 uninstall: