fix: Do not crash on e.g. dmenu < /dev/null

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 60e53d1..a7cd04f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,10 @@
 
 include config.mk
 
 
 include config.mk
 

-all: options dmenu
+SRC = drw.c dmenu.c stest.c util.c
+OBJ = ${SRC:.c=.o}
+
+all: options dmenu stest

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


@@ -11,22 +14,34 @@ options:
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"
 
        @echo "LDFLAGS  = ${LDFLAGS}"
        @echo "CC       = ${CC}"
 

-dmenu: dmenu.o draw.o
+.c.o:
+       @echo CC $<
+       @${CC} -c ${CFLAGS} $<
+
+config.h:
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@
+
+${OBJ}: arg.h config.h config.mk drw.h
+
+dmenu: dmenu.o drw.o util.o

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

-       @${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
+       @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}

 
 

-.c.o: config.mk
-       @echo CC -c $<
-       @${CC} -c $< ${CFLAGS}
+stest: stest.o
+       @echo CC -o $@
+       @${CC} -o $@ stest.o ${LDFLAGS}

 
 clean:
        @echo cleaning
 
 clean:
        @echo cleaning

-       @rm -f dmenu dmenu.o draw.o dmenu-${VERSION}.tar.gz
+       @rm -f dmenu stest ${OBJ} dmenu-${VERSION}.tar.gz

 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}

-       @cp LICENSE Makefile README config.mk dmenu.1 dmenu.c draw.c draw.h dmenu_path dmenu_run dmenu-${VERSION}
+       @cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1 \
+               drw.h util.h dmenu_path dmenu_run stest.1 ${SRC} \
+               dmenu-${VERSION}

        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}
        @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
        @gzip dmenu-${VERSION}.tar
        @rm -rf dmenu-${VERSION}


@@ -34,21 +49,26 @@ dist: clean
 install: all
        @echo installing executables to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin
 install: all
        @echo installing executables to ${DESTDIR}${PREFIX}/bin
        @mkdir -p ${DESTDIR}${PREFIX}/bin

-       @cp -f dmenu dmenu_path dmenu_run ${DESTDIR}${PREFIX}/bin
+       @cp -f dmenu dmenu_path dmenu_run stest ${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

-       @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+       @chmod 755 ${DESTDIR}${PREFIX}/bin/stest
+       @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1

        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
        @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
        @mkdir -p ${DESTDIR}${MANPREFIX}/man1
        @sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1

+       @sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1

        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
        @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1

+       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1

 
 uninstall:
        @echo removing executables from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
 
 uninstall:
        @echo removing executables from ${DESTDIR}${PREFIX}/bin
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_path
        @rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run

+       @rm -f ${DESTDIR}${PREFIX}/bin/stest

        @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

+       @rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1

 
 .PHONY: all options clean dist install uninstall
 
 .PHONY: all options clean dist install uninstall