tweak

diff --git a/Makefile b/Makefile
index 61d7a69e9d1723d8a1b8f9ea06a8a53f0c1a0c58..3f8755c8a2cfd6bbd555c815d1ca3df1146e8169 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,8 @@ clean:
        $(UPROGS)
 
 # make a printout
-PRINT = runoff.list $(shell grep -v '^\#' runoff.list)
+FILES = $(shell grep -v '^\#' runoff.list)
+PRINT = runoff.list $(FILES)
 
 xv6.pdf: $(PRINT)
        ./runoff
@@ -140,17 +141,27 @@ qemu: fs.img xv6.img
 # after running make dist, probably want to
 # rename it to rev0 or rev1 or so on and then
 # check in that version.
+
+EXTRA=\
+       mkfs.c ulib.c user.h cat.c echo.c forktest.c grep.c\
+       kill.c ln.c ls.c mkdir.c rm.c usertests.c wc.c zombie.c\
+       printf.c umalloc.c \
+       README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list\
+
 dist:
        rm -rf dist
        mkdir dist
-       for i in *.c *.h *.S; \
+       for i in $(FILES); \
        do \
                grep -v PAGEBREAK $$i >dist/$$i; \
        done
        sed '/CUT HERE/,$$d' Makefile >dist/Makefile
-       cp README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list dist
+       echo >dist/runoff.spec
+       cp $(EXTRA) dist
 
 dist-test:
+       rm -rf dist
+       make dist
        rm -rf dist-test
        mkdir dist-test
        cp dist/* dist-test

diff --git a/runoff b/runoff
index 8ebaf13d771c274e72c880d1d058d1b753d4f100..b110ca42b52a28918508aec1c279e6c81dd9f8ac 100755 (executable)
--- a/runoff
+++ b/runoff
@@ -202,3 +202,5 @@ else
        cp all.ps allf.ps
 fi
 ps2pdf allf.ps ../xv6.pdf
+cd ..
+pdftops xv6.pdf xv6.ps