merged dmenu & dinput (clunky interface)

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 2f1cada..0d16e38 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 
 include config.mk
 
 
 include config.mk
 

-SRC = dinput.c dmenu.c draw.c
+SRC = dmenu.c

 OBJ = ${SRC:.c=.o}
 
 OBJ = ${SRC:.c=.o}
 

-all: options draw.o dinput dmenu
+all: options dinput dmenu

 
 options:
        @echo dmenu build options:
 
 options:
        @echo dmenu build options:


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

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

 
 config.h:
        @echo creating $@ from config.def.h
        @cp config.def.h $@
 
 
 config.h:
        @echo creating $@ from config.def.h
        @cp config.def.h $@
 

-.o:
+dmenu: ${OBJ}

        @echo CC -o $@
        @echo CC -o $@

-       @${CC} -o $@ $< draw.o ${LDFLAGS}
+       @${CC} -o $@ $+ ${LDFLAGS}

 
 clean:
        @echo cleaning
 
 clean:
        @echo cleaning

-       @rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+       @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz

 
 dist: clean
        @echo creating dist tarball
 
 dist: clean
        @echo creating dist tarball


@@ -43,8 +43,7 @@ dist: clean
 install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin
 install: all
        @echo installing executable file to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin

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

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


@@ -56,7 +55,7 @@ install: all
 uninstall:
        @echo removing executable file from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu ${DESTDIR}${PREFIX}/bin/dmenu_path
 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/dinput ${DESTDIR}${PREFIX}/bin/dmenu_run
+       @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