fixed makefile

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 8c0aa39..da5344b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 # dmenu - dynamic menu
-# © 2006-2007 Anselm R. Garbe, Sander van Dijk
+# See LICENSE file for copyright and license details.
 
 include config.mk
 
-SRC = dmenu.c
+SRC = dinput.c dmenu.c draw.c
 OBJ = ${SRC:.c=.o}
 
-all: options dmenu
+all: options dinput dmenu
 
 options:
        @echo dmenu build options:
@@ -18,20 +18,28 @@ options:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.h config.mk
+${OBJ}: config.h config.mk draw.h
 
-dmenu: ${OBJ}
+config.h:
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@
+
+dinput: dinput.o draw.o
+       @echo CC -o $@
+       @${CC} -o $@ $+ ${LDFLAGS}
+
+dmenu: dmenu.o draw.o
        @echo CC -o $@
-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
+       @${CC} -o $@ $+ ${LDFLAGS}
 
 clean:
        @echo cleaning
-       @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+       @rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
-       @cp -R LICENSE Makefile README config.mk dmenu.1 config.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
+       @cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
@@ -39,7 +47,8 @@ dist: clean
 install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin
-       @cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
+       @cp -f dinput dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/dinput
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
        @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
@@ -51,7 +60,7 @@ install: all
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
-       @rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_run
+       @rm -f ${DESTDIR}${PREFIX}/bin/dinput ${DESTDIR}${PREFIX}/bin/dmenu_run
        @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
        @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1