From 44ce161c139f74cac80dd77aafdfadb49a85af2a Mon Sep 17 00:00:00 2001 From: Anselm R Garbe Date: Mon, 22 Dec 2014 11:16:26 +0100 Subject: [PATCH] applied sin's patch and prepared new release --- LICENSE | 3 ++- Makefile | 8 ++++++-- config.def.h | 2 ++ config.mk | 2 +- slock.c | 2 ++ 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 config.def.h diff --git a/LICENSE b/LICENSE index 1c5152a..b1b3086 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT/X Consortium License -© 2006-2013 Anselm R Garbe +© 2014 Dimitris Papastamos +© 2006-2014 Anselm R Garbe Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/Makefile b/Makefile index 2bea555..1017ac2 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,11 @@ options: @echo CC $< @${CC} -c ${CFLAGS} $< -${OBJ}: config.mk +${OBJ}: config.h config.mk + +config.h: + @echo creating $@ from config.def.h + @cp config.def.h $@ slock: ${OBJ} @echo CC -o $@ @@ -31,7 +35,7 @@ clean: dist: clean @echo creating dist tarball @mkdir -p slock-${VERSION} - @cp -R LICENSE Makefile README config.mk ${SRC} slock-${VERSION} + @cp -R LICENSE Makefile README config.def.h config.mk ${SRC} slock-${VERSION} @tar -cf slock-${VERSION}.tar slock-${VERSION} @gzip slock-${VERSION}.tar @rm -rf slock-${VERSION} diff --git a/config.def.h b/config.def.h new file mode 100644 index 0000000..89e5977 --- /dev/null +++ b/config.def.h @@ -0,0 +1,2 @@ +#define COLOR1 "black" +#define COLOR2 "#005577" diff --git a/config.mk b/config.mk index 8cc3f68..067cfc7 100644 --- a/config.mk +++ b/config.mk @@ -14,7 +14,7 @@ INCS = -I. -I/usr/include -I${X11INC} LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" -DCOLOR2=\"\#005577\" +CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS} diff --git a/slock.c b/slock.c index d281965..5051f04 100644 --- a/slock.c +++ b/slock.c @@ -23,6 +23,8 @@ #include #endif +#include "config.h" + typedef struct { int screen; Window root, win;