initial dmenu / dinput separation

1 files changed, 9 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 5ea6729..d5884da 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 
 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,19 +18,19 @@ options:
         @echo CC $<
         @${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.h config.mk
+${OBJ}: config.h config.mk draw.c
 
 config.h:
         @echo creating $@ from config.def.h
         @cp config.def.h $@
 
-dmenu: ${OBJ}
+.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
@@ -43,7 +43,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
@@ -55,7 +56,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