From e95a6b776e4cd126561fdcafcae9801cea64a3b0 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 24 Jan 2019 20:42:27 -0500 Subject: Tweak Makefile ordering and naming --- Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6e24121..e9cc134 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PREFIX = ~/.local -MANDIR = $(PREFIX)/share/man/man +MANDIR = $(PREFIX)/share/man CHROOT_USER = chat CHROOT_GROUP = $(CHROOT_USER) LIBRESSL_PREFIX = /usr/local @@ -10,7 +10,7 @@ LDFLAGS += -L$(LIBRESSL_PREFIX)/lib LDLIBS = -lcursesw -ltls BINS = catgirl -MANS = catgirl.1 +MAN1 = catgirl.1 -include config.mk @@ -35,30 +35,30 @@ TESTS += term.t all: tags $(BINS) test -$(OBJS): chat.h - catgirl: $(OBJS) $(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@ +$(OBJS): chat.h + +test: $(TESTS) + set -e; $(TESTS:%=./%;) + .SUFFIXES: .t .c.t: $(CC) $(CFLAGS) -DTEST $(LDFLAGS) $< $(LDLIBS) -o $@ -test: $(TESTS) - set -e; $(TESTS:%=./%;) - -tags: *.h *.c - ctags -w *.h *.c +tags: *.c *.h + ctags -w *.c *.h -install: $(BINS) $(MANS) - install -d $(PREFIX)/bin $(MANDIR)1 +install: $(BINS) $(MAN1) + install -d $(PREFIX)/bin $(MANDIR)/man1 install $(BINS) $(PREFIX)/bin - install -m 644 $(MANS) $(MANDIR)1 + install -m 644 $(MAN1) $(MANDIR)/man1 uninstall: rm -f $(BINS:%=$(PREFIX)/bin/%) - rm -f $(MAN:%=%(MANDIR)1/%) + rm -f $(MAN1:%=$(MANDIR)/man1/%) chroot.tar: catgirl catgirl.1 man.sh install -d -o root -g wheel \ @@ -93,10 +93,10 @@ chroot.tar: catgirl catgirl.1 man.sh tar -cf chroot.tar -C root bin etc home lib libexec usr install-chroot: chroot.tar - tar -xf chroot.tar -C /home/$(CHROOT_USER) + tar -x -f chroot.tar -C /home/$(CHROOT_USER) clean: - rm -fr $(OBJS) $(BINS) $(TESTS) tags root chroot.tar + rm -fr $(BINS) $(OBJS) $(TESTS) tags root chroot.tar README: catgirl.7 mandoc catgirl.7 | col -bx > README -- cgit 1.4.1 earch' size='10' name='q' value=''/>
path: root/irc.c (unfollow)
Commit message (Expand)Author
2018-09-15Try successive getaddrinfo resultsJune McEnroe
2018-09-15Render README from chatte.7June McEnroe
2018-09-14Factor out uiPrompt to call on nick changeJune McEnroe
2018-09-14Run test binaries with set -e and semicolonsJune McEnroe
2018-09-14Fail target when any test binary failsJune McEnroe
2018-09-14Run tests in default targetJune McEnroe
2018-09-14Add termEvent testsJune McEnroe
2018-09-14Check width of entire next word including codesJune McEnroe
2018-09-14Remove word handling from formatParseJune McEnroe
2018-09-14Apply consecutive formatting codes at onceJune McEnroe
2018-09-14Add tests for formatParseJune McEnroe
2018-09-13Preview with nick in input windowJune McEnroe
2018-09-13Never send PRIVMSG to TagStatus or TagVerboseJune McEnroe
2018-09-13Move color selection to format.cJune McEnroe
2018-09-13Fix len for format->split at end of stringJune McEnroe
2018-09-13Avoid uninitialized x in uiReadJune McEnroe
2018-09-13Add IRCDefault to colors enumJune McEnroe
2018-09-13Return a format->split even at the end of the stringJune McEnroe
2018-09-13Fix weird tab-complete after commaJune McEnroe
2018-09-13Rewrite UI againJune McEnroe
2018-09-12Add note about C-oJune McEnroe
2018-09-12Use formatParse split to position input cursorJune McEnroe
2018-09-12Factor out IRC formatting parsingJune McEnroe
2018-09-11Add /help equivalent to /manJune McEnroe
2018-09-11Don't render every PM as a pingJune McEnroe
2018-09-11Add urlOpenMatchJune McEnroe
2018-09-10Depend on man.sh for chroot.tar targetJune McEnroe
2018-09-10Set LESSSECURE=1 in man.shJune McEnroe
2018-09-10Add /man commandJune McEnroe
2018-09-10Install man page in chrootJune McEnroe
2018-09-10Install man pageJune McEnroe
2018-09-10Split keys into subsections and document colorsJune McEnroe
2018-09-10Add "blank" lines to chatte.1June McEnroe
2018-09-10Document key bindings in chatte.1June McEnroe
2018-09-08Document slash commands in chatte.1June McEnroe