[hackers] [slock] Makefile: be verbose and remove options || Hiltjo Posthuma

[git]

commit 5678764412873baa62e1536f0622d6a7cec62181
Author:     Hiltjo Posthuma <hil...@codemadness.org>
AuthorDate: Fri Oct 6 11:39:40 2023 +0200
Commit:     Hiltjo Posthuma <hil...@codemadness.org>
CommitDate: Fri Oct 6 11:39:40 2023 +0200

    Makefile: be verbose and remove options
    
    Some things to improve at some point:
    
    * Respect system/packaging CFLAGS/LDFLAGS (don't hardcode -Os -Wall 
-pedantic,
      -s, etc).

diff --git a/Makefile b/Makefile
index b20fd4e..6d74b21 100644
--- a/Makefile
+++ b/Makefile
@@ -6,56 +6,41 @@ include config.mk
 SRC = slock.c ${COMPATSRC}
 OBJ = ${SRC:.c=.o}
 
-all: options slock
-
-options:
-       @echo slock build options:
-       @echo "CFLAGS   = ${CFLAGS}"
-       @echo "LDFLAGS  = ${LDFLAGS}"
-       @echo "CC       = ${CC}"
+all: slock
 
 .c.o:
-       @echo CC $<
-       @${CC} -c ${CFLAGS} $<
+       ${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk arg.h util.h
 
 config.h:
-       @echo creating $@ from config.def.h
-       @cp config.def.h $@
+       cp config.def.h $@
 
 slock: ${OBJ}
-       @echo CC -o $@
-       @${CC} -o $@ ${OBJ} ${LDFLAGS}
+       ${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
-       @echo cleaning
-       @rm -f slock ${OBJ} slock-${VERSION}.tar.gz
+       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 \
+       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}
+       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
-       @cp -f slock ${DESTDIR}${PREFIX}/bin
-       @chmod 755 ${DESTDIR}${PREFIX}/bin/slock
-       @chmod u+s ${DESTDIR}${PREFIX}/bin/slock
-       @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-       @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-       @sed "s/VERSION/${VERSION}/g" <slock.1 
>${DESTDIR}${MANPREFIX}/man1/slock.1
-       @chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
+       mkdir -p ${DESTDIR}${PREFIX}/bin
+       cp -f slock ${DESTDIR}${PREFIX}/bin
+       chmod 755 ${DESTDIR}${PREFIX}/bin/slock
+       chmod u+s ${DESTDIR}${PREFIX}/bin/slock
+       mkdir -p ${DESTDIR}${MANPREFIX}/man1
+       sed "s/VERSION/${VERSION}/g" <slock.1 
>${DESTDIR}${MANPREFIX}/man1/slock.1
+       chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
 
 uninstall:
-       @echo removing executable file from ${DESTDIR}${PREFIX}/bin
-       @rm -f ${DESTDIR}${PREFIX}/bin/slock
-       @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-       @rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
+       rm -f ${DESTDIR}${PREFIX}/bin/slock
+       rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
 
-.PHONY: all options clean dist install uninstall
+.PHONY: all clean dist install uninstall