applied sin's patch and prepared new release - slock - simple X display locker … | |
git clone git://git.suckless.org/slock | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 44ce161c139f74cac80dd77aafdfadb49a85af2a | |
parent 4339b507af01421e2deab63ca9ac3c5bdae5f4cc | |
Author: Anselm R Garbe <[email protected]> | |
Date: Mon, 22 Dec 2014 11:16:26 +0100 | |
applied sin's patch and prepared new release | |
Diffstat: | |
M LICENSE | 3 ++- | |
M Makefile | 8 ++++++-- | |
A config.def.h | 2 ++ | |
M config.mk | 2 +- | |
M slock.c | 2 ++ | |
5 files changed, 13 insertions(+), 4 deletions(-) | |
--- | |
diff --git a/LICENSE b/LICENSE | |
@@ -1,6 +1,7 @@ | |
MIT/X Consortium License | |
-© 2006-2013 Anselm R Garbe <[email protected]> | |
+© 2014 Dimitris Papastamos <[email protected]> | |
+© 2006-2014 Anselm R Garbe <[email protected]> | |
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 | |
@@ -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-${V… | |
@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 | |
@@ -0,0 +1,2 @@ | |
+#define COLOR1 "black" | |
+#define COLOR2 "#005577" | |
diff --git 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\" -DCOLOR… | |
+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 | |
@@ -23,6 +23,8 @@ | |
#include <bsd_auth.h> | |
#endif | |
+#include "config.h" | |
+ | |
typedef struct { | |
int screen; | |
Window root, win; |