Make from a single config file; Remove dist option

programs/slock/Makefile

@@ -20,10 +20,6 @@ options:
 
 ${OBJ}: config.h config.mk arg.h util.h
 
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
-
 slock: ${OBJ}
 	@echo CC -o $@
 	@${CC} -o $@ ${OBJ} ${LDFLAGS}
@@ -32,15 +28,6 @@ clean:
 	@echo cleaning
 	@rm -f slock ${OBJ} slock-${VERSION}.tar.gz
 
-dist: clean
-	@echo creating dist tarball
-	@mkdir -p slock-${VERSION}
-	@cp -R LICENSE Makefile README slock.1 config.mk \
-		${SRC} config.def.h arg.h util.h slock-${VERSION}
-	@tar -cf slock-${VERSION}.tar slock-${VERSION}
-	@gzip slock-${VERSION}.tar
-	@rm -rf slock-${VERSION}
-
 install: all
 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
@@ -58,4 +45,4 @@ uninstall:
 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
 	@rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
 
-.PHONY: all options clean dist install uninstall
+.PHONY: all options clean install uninstall

programs/slock/config.def.h

@@ -1,19 +0,0 @@
-/* user and group to drop privileges to */
-static const char *user  = "nobody";
-static const char *group = "nogroup";
-
-static const char *colorname[NUMCOLS] = {
-	[BG] =     "#282828",   /* background */
-	[INIT] =   "#ebdbb2",   /* after initialization */
-	[INPUT] =  "#8ec07c",   /* during input */
-	[FAILED] = "#fb4934",   /* wrong password */
-};
-
-/* treat a cleared input like a wrong password (color) */
-static const int failonclear = 1;
-
-/* size of square in px */
-static const int squaresize = 50;
-
-/* time in seconds before the monitor shuts down */
-static const int monitortime = 5;