commit 13f13ee5827f082babb121f74ae23548bdd12dd8 parent 910e67db33dc295b73c1861a79d520b0bd527b2d Author: Hiltjo Posthuma <hiltjo@codemadness.org> Date: Wed, 12 Oct 2022 23:01:03 +0200 Makefile: simplify and remove hiding the build process Diffstat:
| M | Makefile | | | 51 | +++++++++++++++++++++------------------------------ |
| M | config.mk | | | 6 | ------ |
2 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/Makefile b/Makefile @@ -16,50 +16,41 @@ options: @echo "CC = ${CC}" .c.o: - @echo CC $< - @${CC} -c ${CFLAGS} $< + ${CC} -c ${CFLAGS} $< ${OBJ}: config.h config.mk config.h: - @echo creating $@ from config.def.h - @cp config.def.h $@ + cp config.def.h $@ .o: - @echo CC -o $@ - @${CC} -o $@ $< ${LDFLAGS} + ${CC} -o $@ $< ${LDFLAGS} clean: - @echo cleaning - @rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz + rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz dist: clean - @echo creating dist tarball - @mkdir -p tabbed-${VERSION} - @cp -R LICENSE Makefile README config.def.h config.mk \ + mkdir -p tabbed-${VERSION} + cp -R LICENSE Makefile README config.def.h config.mk \ tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION} - @tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} - @gzip tabbed-${VERSION}.tar - @rm -rf tabbed-${VERSION} + tar -cf tabbed-${VERSION}.tar tabbed-${VERSION} + gzip tabbed-${VERSION}.tar + rm -rf tabbed-${VERSION} install: all - @echo installing executable files to ${DESTDIR}${PREFIX}/bin - @mkdir -p "${DESTDIR}${PREFIX}/bin" - @cp -f ${BIN} "${DESTDIR}${PREFIX}/bin" - @chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed" - @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1 - @mkdir -p "${DESTDIR}${MANPREFIX}/man1" - @sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1" - @chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1" + mkdir -p "${DESTDIR}${PREFIX}/bin" + cp -f ${BIN} "${DESTDIR}${PREFIX}/bin" + chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed" + mkdir -p "${DESTDIR}${MANPREFIX}/man1" + sed "s/VERSION/${VERSION}/g" < tabbed.1 > "${DESTDIR}${MANPREFIX}/man1/tabbed.1" + chmod 644 "${DESTDIR}${MANPREFIX}/man1/tabbed.1" + sed "s/VERSION/${VERSION}/g" < xembed.1 > "${DESTDIR}${MANPREFIX}/man1/xembed.1" + chmod 644 "${DESTDIR}${MANPREFIX}/man1/xembed.1" uninstall: - @echo removing executable files from ${DESTDIR}${PREFIX}/bin - @rm -f "${DESTDIR}${PREFIX}/bin/tabbed" - @rm -f "${DESTDIR}${PREFIX}/bin/xembed" - @echo removing manual pages from ${DESTDIR}${MANPREFIX}/man1 - @rm -f "${DESTDIR}${MANPREFIX}/man1/tabbed.1" - @rm -f "${DESTDIR}${MANPREFIX}/man1/xembed.1" + rm -f "${DESTDIR}${PREFIX}/bin/tabbed"\ + "${DESTDIR}${PREFIX}/bin/xembed"\ + "${DESTDIR}${MANPREFIX}/man1/tabbed.1"\ + "${DESTDIR}${MANPREFIX}/man1/xembed.1" .PHONY: all options clean dist install uninstall diff --git a/config.mk b/config.mk @@ -1,8 +1,6 @@ # tabbed version VERSION = 0.7 -# Customize below to fit your system - # paths PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man @@ -25,9 +23,5 @@ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS} -# Solaris -#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" -#LDFLAGS = ${LIBS} - # compiler and linker CC = cc