Browse Source

Use braces in Makefile

master
Causal Agent 4 months ago
parent
commit
5e4fbb9abb
Signed by: Curtis McEnroe <june@causal.agency> GPG Key ID: CEA2F97ADCFCD77C
2 changed files with 12 additions and 12 deletions
  1. +11
    -11
      Makefile
  2. +1
    -1
      kcgi.mk

+ 11
- 11
Makefile View File

@@ -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 \

+ 1
- 1
kcgi.mk View File

@@ -1,3 +1,3 @@
CFLAGS += -DHAVE_KCGI -I/usr/local/include
LDFLAGS += -L/usr/local/lib
LDLIBS := -lkcgi $(LDLIBS)
LDLIBS := -lkcgi ${LDLIBS}

Loading…
Cancel
Save