summary refs log tree commit diff
path: root/bin/Makefile
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-10-16 22:25:09 -0400
committerJune McEnroe <june@causal.agency>2018-10-16 22:25:09 -0400
commit0296e57ea6d67a5e0acfb63651b29c7ee7bc8af7 (patch)
treec13b43d7847b54da275b4741e860742846506142 /bin/Makefile
parentUse wchar_t in ttpre (diff)
downloadsrc-0296e57ea6d67a5e0acfb63651b29c7ee7bc8af7.tar.gz
src-0296e57ea6d67a5e0acfb63651b29c7ee7bc8af7.zip
Remove klon
Diffstat (limited to 'bin/Makefile')
-rw-r--r--bin/Makefile56
1 files changed, 26 insertions, 30 deletions
diff --git a/bin/Makefile b/bin/Makefile
index 23643871..10ab1156 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -16,66 +16,62 @@ BINS += ttpre
 BINS += wake
 BINS += xx
 
-BINS_BSD = watch
-BINS_LINUX = bri fbatt fbclock psfed
-BINS_ALL = $(BINS) $(BINS_BSD) $(BINS_LINUX)
+BINS_BSD += watch
 
-GAMES_BSD = klon
-GAMES_ALL = $(GAMES_BSD)
+BINS_LINUX += bri
+BINS_LINUX += fbatt
+BINS_LINUX += fbclock
+BINS_LINUX += psfed
 
-MAN1 = $(BINS_ALL:%=man/%.1)
-MAN6 = $(GAMES_ALL:%=man/%.6)
+BINS_ALL = $(BINS) $(BINS_BSD) $(BINS_LINUX)
+MAN1_ALL = $(BINS_ALL:%=man/%.1)
 
 CFLAGS += -Wall -Wextra -Wpedantic
 LDLIBS = -lcurses -lm -lutil -lz
 
 any: .gitignore tags $(BINS)
 
-bsd: any $(BINS_BSD) $(GAMES_BSD)
+bsd: any $(BINS_BSD)
 
 linux: any $(BINS_LINUX)
 
-tags: *.c
-	ctags -w *.c
-
-scheme.h: scheme
-	./scheme -c > scheme.h
+.gitignore: Makefile
+	echo '*.o' tags scheme.h $(BINS_ALL) scheme.png \
+		| tr ' ' '\n' \
+		> .gitignore
 
-fbatt.o fbclock.o: scheme.h
+tags: *.h *.c
+	ctags -w *.h *.c
 
 atch: dtch
 	ln -f dtch atch
 
+fbatt.o fbclock.o: scheme.h
+
+scheme.h: scheme
+	./scheme -c > scheme.h
+
 open pbcopy pbpaste: pbd
 	ln -f pbd $@
 
 scheme.png: scheme
 	./scheme -t -g > scheme.png
 
-setuid: bri
-	chown root bri
-	chmod u+s bri
-
 clean:
-	rm -f tags scheme.h *.o $(BINS_ALL) $(GAMES_ALL) scheme.png
+	rm -f *.o tags scheme.h $(BINS_ALL) scheme.png
 
 README: man/bin.7
 	mandoc man/bin.7 | col -b -x > README
 
-.gitignore: Makefile
-	echo tags scheme.h *.o $(BINS_ALL) $(GAMES_ALL) scheme.png \
-		| tr ' ' '\n' \
-		> .gitignore
+setuid: bri
+	chown root bri
+	chmod u+s bri
 
 link:
-	mkdir -p $(PREFIX)/bin $(PREFIX)/share/man/man1 $(PREFIX)/share/man/man6
+	mkdir -p $(PREFIX)/bin $(PREFIX)/share/man/man1
 	ln -s -f $(BINS_ALL:%=$(PWD)/%) $(PREFIX)/bin
-	ln -s -f $(GAMES_ALL:%=$(PWD)/%) $(PREFIX)/bin
-	ln -s -f $(MAN1:%=$(PWD)/%) $(PREFIX)/share/man/man1
-	ln -s -f $(MAN6:%=$(PWD)/%) $(PREFIX)/share/man/man6
+	ln -s -f $(MAN1_ALL:%=$(PWD)/%) $(PREFIX)/share/man/man1
 
 unlink:
 	rm -f $(BINS_ALL:%=$(PREFIX)/bin/%)
-	rm -f $(GAMES_ALL:%=$(PREFIX)/bin/%)
-	rm -f $(MAN1:%=$(PREFIX)/share/man/man1/%)
-	rm -f $(MAN6:%=$(PREFIX)/share/man/man6/%)
+	rm -f $(MAN1_ALL:%=$(PREFIX)/share/man/man1/%)
tically the .h rule could match up headers with .3 manual pages if I cared to write them. 2019-02-20Add Dirk Gently's Holistic Detective AgencyJune McEnroe 2019-02-20Move /opt/pkg after /usr in PATHJune McEnroe Installing mandoc from pkgsrc also installs a man executable which is horribly broken. Keep using the system man. 2019-02-20Set man_hard_wrap in nvimJune McEnroe Vendoring man.vim until <https://github.com/neovim/neovim/pull/9633> is merged and appears in a release. 2019-02-18Use hi -o anchor in upJune McEnroe 2019-02-18Don't match nested parentheses in Tag for CJune McEnroe Fixes mistaken highlight of: pngWrite(file, (uint8_t []) { 0, 0, 0 }, 3); 2019-02-18Match whitespace between * [] {}June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe A define like #define FOO (1) is not function-like. 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe