From 720328cef9a9d81d2bd876bdf89103782b9cab91 Mon Sep 17 00:00:00 2001 From: "Ali H. Fardan" Date: Mon, 5 Sep 2016 02:17:30 +0300 Subject: [PATCH] what kind of weed is that? --- Makefile | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ TODO.md | 1 + slstatus.c | 6 ++---- 3 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4848eef --- /dev/null +++ b/Makefile @@ -0,0 +1,55 @@ +# See LICENSE file for copyright and license details. + +include config.mk + +NAME=slstatus + +SRC = ${NAME}.c +OBJ = ${SRC:.c=.o} + +all: options ${NAME} + +options: + @echo ${NAME} build options: + @echo "CFLAGS = ${CFLAGS}" + @echo "LDFLAGS = ${LDFLAGS}" + @echo "CC = ${CC}" + +.c.o: + @echo CC $< + @${CC} -c ${CFLAGS} $< + +${OBJ}: config.h config.mk + +config.h: config.def.h + @echo creating $@ from config.def.h + @cp config.def.h $@ + +${NAME}: ${OBJ} + @echo CC -o $@ + @${CC} -o $@ ${OBJ} ${LDFLAGS} + +clean: + @echo cleaning + @rm -f ${NAME} ${OBJ} ${NAME}-${VERSION}.tar.gz + +dist: clean + @echo creating dist tarball + @mkdir -p ${NAME}-${VERSION} + @cp -R Makefile config.mk LICENSE \ + ${SRC} ${NAME}-${VERSION} + @tar -cf ${NAME}-${VERSION}.tar ${NAME}-${VERSION} + @gzip ${NAME}-${VERSION}.tar + @rm -rf ${NAME}-${VERSION} + +install: all + @echo installing executable file to ${DESTDIR}${PREFIX}/bin + @mkdir -p ${DESTDIR}${PREFIX}/bin + @cp -f ${NAME} ${DESTDIR}${PREFIX}/bin + @chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME} + +uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin + @rm -f ${DESTDIR}${PREFIX}/bin/${NAME} + +.PHONY: all options clean dist install uninstall diff --git a/TODO.md b/TODO.md index ea038b2..f4b54f7 100644 --- a/TODO.md +++ b/TODO.md @@ -2,3 +2,4 @@ Todo ==== - slstatus icon (in that cool dwm icon style) +- include status_reset in the makefile diff --git a/slstatus.c b/slstatus.c index 441c517..da4b237 100644 --- a/slstatus.c +++ b/slstatus.c @@ -601,7 +601,6 @@ main(void) char *res, *element; struct arg argument; - stderr = stderr; dpy = XOpenDisplay(NULL); for (;;) { @@ -621,10 +620,9 @@ main(void) free(res); free(element); } + XStoreName(dpy, DefaultRootWindow(dpy), status_string); + XSync(dpy, False); } - - XStoreName(dpy, DefaultRootWindow(dpy), status_string); - XSync(dpy, False); XCloseDisplay(dpy); return 0;