From 910e67db33dc295b73c1861a79d520b0bd527b2d Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Wed, 12 Oct 2022 22:55:21 +0200
Subject: Makefile: add xembed.1 in the dist target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1b95d15..5c8c19e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ dist: clean
 	@echo creating dist tarball
 	@mkdir -p tabbed-${VERSION}
 	@cp -R LICENSE Makefile README config.def.h config.mk \
-		tabbed.1 arg.h ${SRC} tabbed-${VERSION}
+		tabbed.1 xembed.1 arg.h ${SRC} tabbed-${VERSION}
 	@tar -cf tabbed-${VERSION}.tar tabbed-${VERSION}
 	@gzip tabbed-${VERSION}.tar
 	@rm -rf tabbed-${VERSION}
-- 
cgit v1.2.3


From 13f13ee5827f082babb121f74ae23548bdd12dd8 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Wed, 12 Oct 2022 23:01:03 +0200
Subject: Makefile: simplify and remove hiding the build process

---
 Makefile | 51 +++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 30 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5c8c19e..0069372 100644
--- 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
-- 
cgit v1.2.3


From deda1bb016b035f4387a09df8d81c1fc14eaf189 Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 14 Oct 2022 19:18:10 +0200
Subject: Makefile improvements

* Respect system cflags, ldflags, packages can override them all with
  TABBED_{CFLAGS,LDFLAGS}. Remove -Wall and -Os and -s.
* Install README as documentation.
* dist: stream directly to a gzipped tarball.
* options: remove it.
* Add ".POSIX:"
* Remove config.mk
---
 Makefile | 73 ++++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 30 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0069372..0d0ec3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,69 @@
-# tabbed - tabbing interface
-# See LICENSE file for copyright and license details.
+.POSIX:
 
-include config.mk
+NAME = tabbed
+VERSION = 0.7
+
+# paths
+PREFIX = /usr/local
+MANPREFIX = ${PREFIX}/share/man
+DOCPREFIX = ${PREFIX}/share/doc/${NAME}
+
+# use system flags.
+TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/include/freetype2 ${CFLAGS}
+TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
+TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
+
+# OpenBSD (uncomment)
+#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CPPFLAGS}
 
 SRC = tabbed.c xembed.c
 OBJ = ${SRC:.c=.o}
 BIN = ${OBJ:.o=}
+MAN1 = ${BIN:=.1}
+HDR = arg.h config.def.h
+DOC = LICENSE README
 
-all: options ${BIN}
-
-options:
-	@echo tabbed build options:
-	@echo "CFLAGS   = ${CFLAGS}"
-	@echo "LDFLAGS  = ${LDFLAGS}"
-	@echo "CC       = ${CC}"
+all: ${BIN}
 
 .c.o:
-	${CC} -c ${CFLAGS} $<
+	${CC} -o $@ -c $< ${TABBED_CFLAGS} ${TABBED_CPPFLAGS}
 
-${OBJ}: config.h config.mk
+${OBJ}: config.h
 
 config.h:
 	cp config.def.h $@
 
 .o:
-	${CC} -o $@ $< ${LDFLAGS}
+	${CC} -o $@ $< ${TABBED_LDFLAGS}
 
 clean:
-	rm -f ${BIN} ${OBJ} tabbed-${VERSION}.tar.gz
+	rm -f ${BIN} ${OBJ} "${NAME}-${VERSION}.tar.gz"
 
 dist: clean
-	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}
+	mkdir -p "${NAME}-${VERSION}"
+	cp -fR Makefile ${MAN1} ${DOC} ${HDR} ${SRC} "${NAME}-${VERSION}"
+	tar -cf - "${NAME}-${VERSION}" | gzip -c > "${NAME}-${VERSION}.tar.gz"
+	rm -rf ${NAME}-${VERSION}
 
 install: all
+	# installing executable files.
 	mkdir -p "${DESTDIR}${PREFIX}/bin"
 	cp -f ${BIN} "${DESTDIR}${PREFIX}/bin"
-	chmod 755 "${DESTDIR}${PREFIX}/bin/tabbed"
+	for f in ${BIN}; do chmod 755 "${DESTDIR}${PREFIX}/bin/$$f"; done
+	# installing doc files.
+	mkdir -p "${DESTDIR}${DOCPREFIX}"
+	cp -f README "${DESTDIR}${DOCPREFIX}"
+	# installing manual pages for general commands: section 1.
 	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"
+	for m in ${MAN1}; do sed "s/VERSION/${VERSION}/g" < $$m > "${DESTDIR}${MANPREFIX}/man1/$$m"; done
 
 uninstall:
-	rm -f "${DESTDIR}${PREFIX}/bin/tabbed"\
-		"${DESTDIR}${PREFIX}/bin/xembed"\
-		"${DESTDIR}${MANPREFIX}/man1/tabbed.1"\
-		"${DESTDIR}${MANPREFIX}/man1/xembed.1"
+	# removing executable files.
+	for f in ${BIN}; do rm -f "${DESTDIR}${PREFIX}/bin/$$f"; done
+	# removing doc files.
+	rm -f "${DESTDIR}${DOCPREFIX}/README"
+	# removing manual pages.
+	for m in ${MAN1}; do rm -f "${DESTDIR}${MANPREFIX}/man1/$$m"; done
+	-rmdir "${DESTDIR}${DOCPREFIX}"
 
-.PHONY: all options clean dist install uninstall
+.PHONY: all clean dist install uninstall
-- 
cgit v1.2.3


From 418899e7445deaf92b0fc8401867b421accb6e1c Mon Sep 17 00:00:00 2001
From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Fri, 14 Oct 2022 19:19:54 +0200
Subject: Makefile: whoops add proper comment for OpenBSD

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0d0ec3e..f8f5ba4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ TABBED_LDFLAGS = -L/usr/X11R6/lib -lX11 -lfontconfig -lXft ${LDFLAGS}
 TABBED_CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE
 
 # OpenBSD (uncomment)
-#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CPPFLAGS}
+#TABBED_CFLAGS = -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 ${CFLAGS}
 
 SRC = tabbed.c xembed.c
 OBJ = ${SRC:.c=.o}
-- 
cgit v1.2.3