From 7d5fe17391fefd978eab281a6cbebe2aa601e9ce Mon Sep 17 00:00:00 2001 From: Connor Lane Smith Date: Fri, 30 Jul 2010 13:40:56 +0100 Subject: merged dmenu & dinput (clunky interface) --- Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7274923..0d16e38 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include config.mk -SRC = dinput.c dmenu.c common.c +SRC = dmenu.c OBJ = ${SRC:.c=.o} all: options dinput dmenu @@ -24,17 +24,13 @@ config.h: @echo creating $@ from config.def.h @cp config.def.h $@ -dinput: dinput.o common.o - @echo CC -o $@ - @${CC} -o $@ $+ ${LDFLAGS} - -dmenu: dmenu.o common.o +dmenu: ${OBJ} @echo CC -o $@ @${CC} -o $@ $+ ${LDFLAGS} 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 @@ -47,8 +43,7 @@ dist: clean 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 @@ -60,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 - @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 -- cgit v1.2.3-54-g00ecf