aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorC. McEnroe <june@causal.agency>2019-07-27 17:57:11 -0400
committerC. McEnroe <june@causal.agency>2019-07-27 17:57:48 -0400
commit5e4fbb9abb3f0f1baa44cc5de69d03bce3c2bef0 (patch)
tree89d76017b3a4b0257ad9ecf717afe10f9332ce70
parentMake copyright headers consistent (diff)
downloadtorus-5e4fbb9abb3f0f1baa44cc5de69d03bce3c2bef0.tar.gz
torus-5e4fbb9abb3f0f1baa44cc5de69d03bce3c2bef0.zip
Use braces in Makefile
-rw-r--r--Makefile22
-rw-r--r--kcgi.mk2
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 5cb00b5..dfe30e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
CHROOT_USER = torus
-CHROOT_GROUP = $(CHROOT_USER)
+CHROOT_GROUP = ${CHROOT_USER}
CFLAGS += -std=c11 -Wall -Wextra -Wpedantic
LDFLAGS = -static
@@ -8,18 +8,18 @@ LDLIBS = -lcursesw -lutil -lz
-include config.mk
BINS = client image merge meta server
-OBJS = $(BINS:%=%.o)
+OBJS = ${BINS:%=%.o}
-all: tags $(BINS)
+all: tags ${BINS}
-$(OBJS): torus.h
+${OBJS}: torus.h
client.o: help.h
image.o: png.h
.o:
- $(CC) $(LDFLAGS) $< $(LDLIBS) -o $@
+ ${CC} ${LDFLAGS} $< ${LDLIBS} -o $@
tags: *.h *.c
ctags -w *.h *.c
@@ -32,25 +32,25 @@ chroot.tar: client image server default8x16.psfu
root/usr/share/misc \
root/usr/share/torus \
root/var/run
- install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER)
- install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/var/run/torus
+ install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/home/${CHROOT_USER}
+ install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/var/run/torus
cp -af /usr/share/locale root/usr/share
cp -fp /usr/share/misc/termcap.db root/usr/share/misc
cp -fp /rescue/sh root/bin
install client image server root/bin
install -m 644 default8x16.psfu root/usr/share/torus
- tar -cf chroot.tar -C root bin home usr var
+ tar -c -f chroot.tar -C root bin home usr var
install: chroot.tar rc.torus explore.html index.html
- tar -xf chroot.tar -C /home/$(CHROOT_USER)
+ tar -x -f chroot.tar -C /home/${CHROOT_USER}
install rc.torus /usr/local/etc/rc.d/torus
- install -o $(CHROOT_USER) -g $(CHROOT_GROUP) -m 644 \
+ install -o ${CHROOT_USER} -g ${CHROOT_GROUP} -m 644 \
explore.html \
index.html \
/usr/local/www/ascii.town
clean:
- rm -fr $(OBJS) $(BINS) tags root chroot.tar
+ rm -fr ${OBJS} ${BINS} tags root chroot.tar
help.h:
head -c 4096 torus.dat \
diff --git a/kcgi.mk b/kcgi.mk
index 8492047..1b61091 100644
--- a/kcgi.mk
+++ b/kcgi.mk
@@ -1,3 +1,3 @@
CFLAGS += -DHAVE_KCGI -I/usr/local/include
LDFLAGS += -L/usr/local/lib
-LDLIBS := -lkcgi $(LDLIBS)
+LDLIBS := -lkcgi ${LDLIBS}