add ^M

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 66040d9..5871fa7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # dmenu - dynamic menu
 # dmenu - dynamic menu

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

 
 include config.mk
 
 
 include config.mk
 

-SRC = main.c util.c
+SRC = dmenu.c draw.c

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


@@ -15,15 +15,14 @@ options:
        @echo "CC       = ${CC}"
 
 .c.o:
        @echo "CC       = ${CC}"
 
 .c.o:

-       @echo CC $<
-       @${CC} -c ${CFLAGS} $<
+       @echo CC -c $<
+       @${CC} -c $< ${CFLAGS}

 
 

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

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

-       @strip $@

 
 clean:
        @echo cleaning
 
 clean:
        @echo cleaning


@@ -32,24 +31,28 @@ clean:
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}

-       @cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
+       @cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}

        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
 
 install: all
        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
 
 install: all

-       @echo installing executable file to ${DESTDIR}${PREFIX}/bin
+       @echo installing executables to ${DESTDIR}${PREFIX}/bin

        @mkdir -p ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin

-       @cp -f dmenu ${DESTDIR}${PREFIX}/bin
+       @cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin

        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu

+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run

        @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
        @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
        @mkdir -p ${DESTDIR}${MANPREFIX}/man1

-       @sed 's/VERSION/${VERSION}/g' < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
+       @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1

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

-       @echo removing executable file from ${DESTDIR}${PREFIX}/bin
+       @echo removing executables from ${DESTDIR}${PREFIX}/bin

        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu

+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
+       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run

        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
 
        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1