merged dmenu & dinput (clunky interface)

This commit is contained in:
Connor Lane Smith 2010-07-30 13:40:56 +01:00
parent 7f36736d11
commit 7d5fe17391
5 changed files with 215 additions and 440 deletions

View file

@ -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