about summary refs log tree commit diff homepage
path: root/Makefile
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-08-27 17:23:33 -0400
committerJune McEnroe <june@causal.agency>2018-08-27 17:23:33 -0400
commit5d7ac824b28fa6427fcb6b1c2f0b4f42fb543d6e (patch)
tree2244f64fc570088a6d3767f50f6df609540b762b /Makefile
parentFix color pairs once and for all (diff)
parentDump HELP_DATA with client -h (diff)
downloadtorus-5d7ac824b28fa6427fcb6b1c2f0b4f42fb543d6e.tar.gz
torus-5d7ac824b28fa6427fcb6b1c2f0b4f42fb543d6e.zip
Merge branch 'ansi'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile49
1 files changed, 30 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 8df5425..9199a7b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,31 @@
-USER = torus
-BINS = server client help meta merge
+CHROOT_USER = torus
+CHROOT_GROUP = $(CHROOT_USER)
+
 CFLAGS += -Wall -Wextra -Wpedantic
-LDLIBS = -lm -lcurses
+LDLIBS = -lcursesw
+BINS = server client meta merge
+OBJS = $(BINS:%=%.o)
 
 all: tags $(BINS)
 
-$(BINS): torus.h
+.o:
+	$(CC) $(LDFLAGS) $< $(LDLIBS) -o $@
+
+$(OBJS): torus.h
+
+client.o: help.h
 
-# Only necessary so GNU make doesn't try to use torus.h as a source.
-.c:
-	$(CC) $(CFLAGS) $(LDFLAGS) $< $(LDLIBS) -o $@
+help.h:
+	head -c 4096 torus.dat \
+		| file2c -s -x 'static const uint8_t HELP_DATA[] = {' '};' \
+		> help.h
+	echo 'static const struct Tile *HELP = (const struct Tile *)HELP_DATA;' \
+		>> help.h
 
-chroot.tar: server client help
+tags: *.h *.c
+	ctags -w *.h *.c
+
+chroot.tar: server client
 	mkdir -p root
 	install -d -o root -g wheel \
 	    root/bin \
@@ -21,22 +35,19 @@ chroot.tar: server client help
 	    root/usr \
 	    root/usr/share \
 	    root/usr/share/misc
-	install -d -o $(USER) -g $(USER) root/home/$(USER)
-	install -o root -g wheel -m 555 /libexec/ld-elf.so.1 root/libexec
-	install -o root -g wheel -m 444 \
+	install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER)
+	cp -p -f /libexec/ld-elf.so.1 root/libexec
+	cp -p -f \
 	    /lib/libc.so.7 \
-		/lib/libm.so.5 \
 	    /lib/libedit.so.7 \
 	    /lib/libncurses.so.8 \
 	    /lib/libncursesw.so.8 \
 	    root/lib
-	install -o root -g wheel -m 444 /usr/share/misc/termcap.db root/usr/share/misc
-	install -o root -g wheel -m 555 /bin/sh root/bin
-	install -o root -g wheel -m 555 server client help root/bin
+	cp -a -f /usr/share/locale root/usr/share
+	cp -p -f /usr/share/misc/termcap.db root/usr/share/misc
+	cp -p -f /bin/sh root/bin
+	install -o root -g wheel -m 555 server client root/bin
 	tar -c -f chroot.tar -C root bin home lib libexec usr
 
-tags: *.h *.c
-	ctags -w *.h *.c
-
 clean:
-	rm -f tags $(BINS) chroot.tar
+	rm -f tags $(OBJS) $(BINS) chroot.tar