add sbase-style ecalloc(), calloc: or die

[dmenu.git] / Makefile

diff --git a/Makefile b/Makefile
index 5871fa7d0375c72b6843f3a828accb01681eb00a..8f14a8c27751e6aefcfda5fe67ba724d7a8f28d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 
 include config.mk
 
-SRC = dmenu.c draw.c
+SRC = drw.c dmenu.c stest.c util.c
 OBJ = ${SRC:.c=.o}
 
-all: options dmenu
+all: options dmenu stest
 
 options:
        @echo dmenu build options:
@@ -15,23 +15,32 @@ options:
        @echo "CC       = ${CC}"
 
 .c.o:
-       @echo CC -c $<
-       @${CC} -c $< ${CFLAGS}
+       @echo CC $<
+       @${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.mk
+config.h:
+       @echo creating $@ from config.def.h
+       @cp config.def.h $@
 
-dmenu: ${OBJ}
+${OBJ}: arg.h config.h config.mk drw.h
+
+dmenu: dmenu.o drw.o util.o
+       @echo CC -o $@
+       @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
+
+stest: stest.o
        @echo CC -o $@
-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
+       @${CC} -o $@ stest.o ${LDFLAGS}
 
 clean:
        @echo cleaning
-       @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz
+       @rm -f dmenu stest ${OBJ} dmenu-${VERSION}.tar.gz
 
 dist: clean
        @echo creating dist tarball
        @mkdir -p dmenu-${VERSION}
-       @cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
+       @cp LICENSE Makefile README arg.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}
@@ -39,21 +48,26 @@ dist: clean
 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
-       @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
+       @sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.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
+       @rm -f ${DESTDIR}${PREFIX}/bin/stest
        @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