Browse Source

Use braces in Makefile

master
Causal Agent 4 months ago
parent
commit
aa3cf0b7d3
Signed by: Curtis McEnroe <june@causal.agency> GPG Key ID: CEA2F97ADCFCD77C
4 changed files with 27 additions and 27 deletions
  1. +1
    -1
      Darwin.mk
  2. +3
    -3
      Linux.mk
  3. +22
    -22
      Makefile
  4. +1
    -1
      NetBSD.mk

+ 1
- 1
Darwin.mk View File

@@ -1,4 +1,4 @@
LIBRESSL_PREFIX = /usr/local/opt/libressl
LDLIBS = -lcurses -ltls -framework Cocoa
BINS += sandman
MAN1 += sandman.1
MANS += sandman.1

+ 3
- 3
Linux.mk View File

@@ -1,6 +1,6 @@
LIBRESSL_PREFIX = /usr/local
CFLAGS += -D_GNU_SOURCE
LDLIBS = -lncursesw -lpthread
LDLIBS += $(LIBRESSL_PREFIX)/lib/libtls.a
LDLIBS += $(LIBRESSL_PREFIX)/lib/libssl.a
LDLIBS += $(LIBRESSL_PREFIX)/lib/libcrypto.a
LDLIBS += ${LIBRESSL_PREFIX}/lib/libtls.a
LDLIBS += ${LIBRESSL_PREFIX}/lib/libssl.a
LDLIBS += ${LIBRESSL_PREFIX}/lib/libcrypto.a

+ 22
- 22
Makefile View File

@@ -1,16 +1,16 @@
PREFIX = ~/.local
MANDIR = $(PREFIX)/share/man
MANDIR = ${PREFIX}/share/man
CHROOT_USER = chat
CHROOT_GROUP = $(CHROOT_USER)
CHROOT_GROUP = ${CHROOT_USER}
LIBRESSL_PREFIX = /usr/local

CFLAGS += -std=c11 -Wall -Wextra -Wpedantic
CFLAGS += -I$(LIBRESSL_PREFIX)/include
LDFLAGS += -L$(LIBRESSL_PREFIX)/lib
CFLAGS += -I${LIBRESSL_PREFIX}/include
LDFLAGS += -L${LIBRESSL_PREFIX}/lib
LDLIBS = -lcursesw -ltls

BINS = catgirl
MAN1 = catgirl.1
MANS = catgirl.1

-include config.mk

@@ -34,32 +34,32 @@ TESTS += format.t
TESTS += pls.t
TESTS += term.t

all: tags $(BINS) test
all: tags ${BINS} test

catgirl: $(OBJS)
$(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
catgirl: ${OBJS}
${CC} ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@

$(OBJS): chat.h
${OBJS}: chat.h

test: $(TESTS)
set -e; $(TESTS:%=./%;)
test: ${TESTS}
set -e; ${TESTS:%=./%;}

.SUFFIXES: .t

.c.t:
$(CC) $(CFLAGS) -DTEST $(LDFLAGS) $< $(LDLIBS) -o $@
${CC} ${CFLAGS} -DTEST ${LDFLAGS} $< ${LDLIBS} -o $@

tags: *.c *.h
ctags -w *.c *.h

install: $(BINS) $(MAN1)
install -d $(PREFIX)/bin $(MANDIR)/man1
install $(BINS) $(PREFIX)/bin
install -m 644 $(MAN1) $(MANDIR)/man1
install: ${BINS} ${MANS}
install -d ${PREFIX}/bin ${MANDIR}/man1
install ${BINS} ${PREFIX}/bin
install -m 644 ${MANS} ${MANDIR}/man1

uninstall:
rm -f $(BINS:%=$(PREFIX)/bin/%)
rm -f $(MAN1:%=$(MANDIR)/man1/%)
rm -f ${BINS:%=${PREFIX}/bin/%}
rm -f ${MANS:%=${MANDIR}/man1/%}

chroot.tar: catgirl catgirl.1 man.sh
install -d -o root -g wheel \
@@ -73,7 +73,7 @@ chroot.tar: catgirl catgirl.1 man.sh
root/usr/local/etc/ssl \
root/usr/share/man \
root/usr/share/misc
install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER)
install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/home/${CHROOT_USER}
cp -fp /libexec/ld-elf.so.1 root/libexec
cp -fp \
/lib/libc.so.7 \
@@ -89,15 +89,15 @@ chroot.tar: catgirl catgirl.1 man.sh
cp -af /usr/share/locale root/usr/share
cp -fp /usr/share/misc/termcap.db root/usr/share/misc
cp -fp /rescue/sh /usr/bin/mandoc /usr/bin/less root/bin
$(MAKE) install PREFIX=root/usr
${MAKE} install PREFIX=root/usr
install man.sh root/usr/bin/man
tar -c -f chroot.tar -C root bin etc home lib libexec usr

install-chroot: chroot.tar
tar -x -f chroot.tar -C /home/$(CHROOT_USER)
tar -x -f chroot.tar -C /home/${CHROOT_USER}

clean:
rm -fr $(BINS) $(OBJS) $(TESTS) tags root chroot.tar
rm -fr ${BINS} ${OBJS} ${TESTS} tags root chroot.tar

README: catgirl.7
mandoc catgirl.7 | col -bx > README

+ 1
- 1
NetBSD.mk View File

@@ -1,3 +1,3 @@
LIBRESSL_PREFIX = /usr/pkg/libressl
LDFLAGS += -rpath=$(LIBRESSL_PREFIX)/lib
LDFLAGS += -rpath=${LIBRESSL_PREFIX}/lib
LDLIBS = -lcurses -ltls

Loading…
Cancel
Save