summary refs log tree commit diff
path: root/www/git.causal.agency/Makefile
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-10-01 23:29:16 +0000
committerJune McEnroe <june@causal.agency>2021-10-02 00:18:59 +0000
commit6d93d68d7d8264d91842c98267bd96fa1cd06ba2 (patch)
tree6c537e8b8e84999edfbe3b053157cfc6c9585247 /www/git.causal.agency/Makefile
parentAdd htagml -m to rename main tag (diff)
downloadsrc-6d93d68d7d8264d91842c98267bd96fa1cd06ba2.tar.gz
src-6d93d68d7d8264d91842c98267bd96fa1cd06ba2.zip
Replace filter shell scripts with C program
Eliminates the need for a shell inside the chroot, along with cat,
mktemp and rm. It's likely a bit faster too.
Diffstat (limited to '')
-rw-r--r--www/git.causal.agency/Makefile26
1 files changed, 12 insertions, 14 deletions
diff --git a/www/git.causal.agency/Makefile b/www/git.causal.agency/Makefile
index 76c93d3a..f05d4a4a 100644
--- a/www/git.causal.agency/Makefile
+++ b/www/git.causal.agency/Makefile
@@ -3,46 +3,44 @@ CONFDIR = ${PREFIX}/conf
 DATADIR = ${PREFIX}/cgit
 BINDIR = ${PREFIX}/bin
 
+CFLAGS += -Wall -Wextra
+LDFLAGS = -static -pie
+
 BINS += about-filter
-BINS += cat
-BINS += compress
 BINS += ctags
 BINS += email-filter
 BINS += gzip
 BINS += hilex
 BINS += htagml
 BINS += mandoc
-BINS += mktemp
 BINS += mtags
 BINS += owner-filter
-BINS += rm
-BINS += sh
 BINS += source-filter
 
 all: ${BINS}
 
-cat rm sh:
-	cp /bin/$@ $@
-
-compress ctags mandoc mktemp:
-	${MAKE} -C /usr/src/usr.bin/$@ LDFLAGS='-static -pie'
+compress ctags mandoc:
+	${MAKE} -C /usr/src/usr.bin/$@ LDFLAGS='${LDFLAGS}'
 	mv /usr/src/usr.bin/$@/$@ $@
 	${MAKE} -C /usr/src/usr.bin/$@ clean
 
 gzip: compress
-	cp compress $@
+	ln -f compress $@
 
 hilex htagml mtags:
 	rm -f ../../bin/$@
-	${MAKE} -C ../../bin $@ LDFLAGS='-static -pie'
+	${MAKE} -C ../../bin $@ LDFLAGS='${LDFLAGS}'
 	mv ../../bin/$@ $@
 
+about-filter email-filter owner-filter source-filter: filter
+	ln -f filter $@
+
 install: cgitrc custom.css ${BINS}
 	install -m 644 cgitrc ${CONFDIR}
 	install -m 644 custom.css ${DATADIR}
 	install -d -o www -g daemon ${PREFIX}/cache/cgit
 	install -d -m 1700 -o www -g daemon ${PREFIX}/tmp
-	install ${BINS} ${BINDIR}
+	install -s ${BINS} ${BINDIR}
 
 clean:
-	rm -f ${BINS}
+	rm -f compress filter ${BINS}