diff options
-rw-r--r-- | LICENSE | 3 | ||||
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | config.def.h | 2 | ||||
-rw-r--r-- | config.mk | 2 | ||||
-rw-r--r-- | slock.c | 2 |
5 files changed, 13 insertions, 4 deletions
@@ -1,6 +1,7 @@ | |||
1 | MIT/X Consortium License | 1 | MIT/X Consortium License |
2 | 2 | ||
3 | © 2006-2013 Anselm R Garbe <anselm@garbe.us> | 3 | © 2014 Dimitris Papastamos <sin@2f30.org> |
4 | © 2006-2014 Anselm R Garbe <anselm@garbe.us> | ||
4 | 5 | ||
5 | Permission is hereby granted, free of charge, to any person obtaining a | 6 | Permission is hereby granted, free of charge, to any person obtaining a |
6 | copy of this software and associated documentation files (the "Software"), | 7 | copy of this software and associated documentation files (the "Software"), |
@@ -18,7 +18,11 @@ options: | |||
18 | @echo CC $< | 18 | @echo CC $< |
19 | @${CC} -c ${CFLAGS} $< | 19 | @${CC} -c ${CFLAGS} $< |
20 | 20 | ||
21 | ${OBJ}: config.mk | 21 | ${OBJ}: config.h config.mk |
22 | |||
23 | config.h: | ||
24 | @echo creating $@ from config.def.h | ||
25 | @cp config.def.h $@ | ||
22 | 26 | ||
23 | slock: ${OBJ} | 27 | slock: ${OBJ} |
24 | @echo CC -o $@ | 28 | @echo CC -o $@ |
@@ -31,7 +35,7 @@ clean: | |||
31 | dist: clean | 35 | dist: clean |
32 | @echo creating dist tarball | 36 | @echo creating dist tarball |
33 | @mkdir -p slock-${VERSION} | 37 | @mkdir -p slock-${VERSION} |
34 | @cp -R LICENSE Makefile README config.mk ${SRC} slock-${VERSION} | 38 | @cp -R LICENSE Makefile README config.def.h config.mk ${SRC} slock-${VERSION} |
35 | @tar -cf slock-${VERSION}.tar slock-${VERSION} | 39 | @tar -cf slock-${VERSION}.tar slock-${VERSION} |
36 | @gzip slock-${VERSION}.tar | 40 | @gzip slock-${VERSION}.tar |
37 | @rm -rf slock-${VERSION} | 41 | @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 @@ | |||
1 | #define COLOR1 "black" | ||
2 | #define COLOR2 "#005577" | ||
@@ -14,7 +14,7 @@ INCS = -I. -I/usr/include -I${X11INC} | |||
14 | LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext | 14 | LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext |
15 | 15 | ||
16 | # flags | 16 | # flags |
17 | CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" -DCOLOR2=\"\#005577\" | 17 | CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H |
18 | CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} | 18 | CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
19 | LDFLAGS = -s ${LIBS} | 19 | LDFLAGS = -s ${LIBS} |
20 | 20 | ||
@@ -23,6 +23,8 @@ | |||
23 | #include <bsd_auth.h> | 23 | #include <bsd_auth.h> |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #include "config.h" | ||
27 | |||
26 | typedef struct { | 28 | typedef struct { |
27 | int screen; | 29 | int screen; |
28 | Window root, win; | 30 | Window root, win; |