From 520478a3e493a2e3e2ba399f601c4e4c84f47e22 Mon Sep 17 00:00:00 2001 From: Warren Toomey Date: Sun, 20 Mar 2016 09:14:47 +1000 Subject: [PATCH] I moved most of the building code into the build/Makefile. --- Makefile | 66 +++++++------------------------------------------- build/Makefile | 66 +++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 63 insertions(+), 69 deletions(-) diff --git a/Makefile b/Makefile index 22e6ced..0913396 100644 --- a/Makefile +++ b/Makefile @@ -1,69 +1,23 @@ -# Top level makefile to build the utilities etc +# Top level makefile to build the tests and everything else AS=tools/as7 ASARGS=--format=ptr -SYSDIR=sys -CMDDIR=bin TESTDIR=tests -all: sys cmd others tests build +all: buildit testit -build: cmd others +buildit: cd build && make runsh: all cd bin && ../tools/a7out sh -dirs: - mkdir -p $(SYSDIR) - mkdir -p $(CMDDIR) +testit: mkdir -p $(TESTDIR) - -sys: dirs - $(AS) $(ASARGS) -o $(SYSDIR)/unix src/sys/*.s - -cmd: dirs -# $(AS) $(ASARGS) -o $(CMDDIR)/adm src/cmd/adm.s -# $(AS) $(ASARGS) -o $(CMDDIR)/apr src/cmd/apr.s - $(AS) $(ASARGS) -o $(CMDDIR)/as src/cmd/as.s -# $(AS) $(ASARGS) -o $(CMDDIR)/bc src/cmd/bc.s -# $(AS) $(ASARGS) -o $(CMDDIR)/bi src/cmd/bi.s -# $(AS) $(ASARGS) -o $(CMDDIR)/bl src/cmd/bl.s -# $(AS) $(ASARGS) -o $(CMDDIR)/cas src/cmd/cas.s - $(AS) $(ASARGS) -o $(CMDDIR)/cat src/cmd/cat.s - $(AS) $(ASARGS) -o $(CMDDIR)/check src/cmd/check.s - $(AS) $(ASARGS) -o $(CMDDIR)/chmod src/cmd/chmod.s - $(AS) $(ASARGS) -o $(CMDDIR)/chown src/cmd/chown.s - $(AS) $(ASARGS) -o $(CMDDIR)/chrm src/cmd/chrm.s - $(AS) $(ASARGS) -o $(CMDDIR)/cp src/cmd/cp.s -# $(AS) $(ASARGS) -o $(CMDDIR)/db src/cmd/db.s -# $(AS) $(ASARGS) -o $(CMDDIR)/dmabs src/cmd/dmabs.s - $(AS) $(ASARGS) -o $(CMDDIR)/ds src/cmd/ds.s -# $(AS) $(ASARGS) -o $(CMDDIR)/dskio src/cmd/dskio.s -# $(AS) $(ASARGS) -o $(CMDDIR)/dskres src/cmd/dskres.s -# $(AS) $(ASARGS) -o $(CMDDIR)/dsksav src/cmd/dsksav.s -# $(AS) $(ASARGS) -o $(CMDDIR)/dsw src/cmd/dsw.s - $(AS) $(ASARGS) -o $(CMDDIR)/ed src/cmd/ed1.s src/cmd/ed2.s - $(AS) $(ASARGS) -o $(CMDDIR)/init src/cmd/init.s - -others: dirs - $(AS) $(ASARGS) -o $(CMDDIR)/sh src/other/pbsh.s - -# wkt apps - $(AS) $(ASARGS) -o $(CMDDIR)/ls src/other/wktls.s - $(AS) $(ASARGS) -o $(CMDDIR)/wktcat src/other/wktcat.s - $(AS) $(ASARGS) -o $(CMDDIR)/wktcp src/other/wktcp.s - $(AS) $(ASARGS) -o $(CMDDIR)/date src/other/wktdate.s - $(AS) $(ASARGS) -o $(CMDDIR)/ln src/other/wktln.s - $(AS) $(ASARGS) -o $(CMDDIR)/ls src/other/wktls.s - $(AS) $(ASARGS) -o $(CMDDIR)/mv src/other/wktmv.s - $(AS) $(ASARGS) -o $(CMDDIR)/stat src/other/wktstat.s - -tests: dirs - $(AS) $(ASARGS) -o $(TESTDIR)/decimal_out src/tests/decimal_out.s - $(AS) $(ASARGS) -o $(TESTDIR)/fork_test src/tests/fork_test.s - $(AS) $(ASARGS) -o $(TESTDIR)/octal_test src/tests/octal_test.s - $(AS) $(ASARGS) -o $(TESTDIR)/testmul src/tests/testmul.s - $(AS) $(ASARGS) -o $(TESTDIR)/write_test src/tests/write_test.s + $(AS) $(ASARGS) -o $(TESTDIR)/decimal_out src/tests/decimal_out.s + $(AS) $(ASARGS) -o $(TESTDIR)/fork_test src/tests/fork_test.s + $(AS) $(ASARGS) -o $(TESTDIR)/octal_test src/tests/octal_test.s + $(AS) $(ASARGS) -o $(TESTDIR)/testmul src/tests/testmul.s + $(AS) $(ASARGS) -o $(TESTDIR)/write_test src/tests/write_test.s runtests: tests cd tests && ../tools/a7out decimal_out @@ -73,7 +27,5 @@ runtests: tests # cd tests && ../tools/a7out write_test clean: - rm -rf $(SYSDIR)/* - rm -rf $(CMDDIR)/* rm -rf $(TESTDIR)/* cd build && make clean diff --git a/build/Makefile b/build/Makefile index 8efc8aa..0d31b31 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,26 +1,68 @@ -# Build the kernel, the filesystem and run SimH -# Put any defines for as7 here -#DEFINES= +# Build the kernel, the utilities, the filesystem and run SimH -AS=../tools/as7 $(DEFINES) +AS=../tools/as7 +ASARGS=--format=ptr MKFS=../tools/mkfs7 -SYS=../src/sys -all: a.rim image.fs +SYSSRC=../src/sys +CMDSRC=../src/cmd +OTHERSRC=../src/other +BINDIR=../bin -run: a.rim image.fs +all: cmd others a.rim image.fs + +# Manually make all before make run +run: pdp7 unixv0.simh a.rim: - $(AS) -f rim -o a.rim $(SYS)/sop.s $(SYS)/s[1-8].s - $(AS) -n -f list -o a.lst $(SYS)/sop.s $(SYS)/s[1-8].s + $(AS) -f rim -o a.rim $(SYSSRC)/sop.s $(SYSSRC)/s[1-8].s + $(AS) -n -f list -o a.lst $(SYSSRC)/sop.s $(SYSSRC)/s[1-8].s coldboot: - $(AS) -f rim -o a.rim $(SYS)/sop.s $(SYS)/s[1-9].s - $(AS) -n -f list -o a.lst $(SYS)/sop.s $(SYS)/s[1-9].s + $(AS) -f rim -o a.rim $(SYSSRC)/sop.s $(SYSSRC)/s[1-9].s + $(AS) -n -f list -o a.lst $(SYSSRC)/sop.s $(SYSSRC)/s[1-9].s image.fs: $(MKFS) --format simh proto clean: - rm -f a.rim image.fs a.lst n.out + rm -f a.rim image.fs a.lst n.out $(BINDIR)/* + +dirs: + mkdir -p $(BINDIR) + +cmd: dirs +# $(AS) $(ASARGS) -o $(BINDIR)/adm $(CMDSRC)/adm.s +# $(AS) $(ASARGS) -o $(BINDIR)/apr $(CMDSRC)/apr.s + $(AS) $(ASARGS) -o $(BINDIR)/as $(CMDSRC)/as.s +# $(AS) $(ASARGS) -o $(BINDIR)/bc $(CMDSRC)/bc.s +# $(AS) $(ASARGS) -o $(BINDIR)/bi $(CMDSRC)/bi.s +# $(AS) $(ASARGS) -o $(BINDIR)/bl $(CMDSRC)/bl.s +# $(AS) $(ASARGS) -o $(BINDIR)/cas $(CMDSRC)/cas.s + $(AS) $(ASARGS) -o $(BINDIR)/cat $(CMDSRC)/cat.s + $(AS) $(ASARGS) -o $(BINDIR)/check $(CMDSRC)/check.s + $(AS) $(ASARGS) -o $(BINDIR)/chmod $(CMDSRC)/chmod.s + $(AS) $(ASARGS) -o $(BINDIR)/chown $(CMDSRC)/chown.s + $(AS) $(ASARGS) -o $(BINDIR)/chrm $(CMDSRC)/chrm.s + $(AS) $(ASARGS) -o $(BINDIR)/cp $(CMDSRC)/cp.s +# $(AS) $(ASARGS) -o $(BINDIR)/db $(CMDSRC)/db.s +# $(AS) $(ASARGS) -o $(BINDIR)/dmabs $(CMDSRC)/dmabs.s + $(AS) $(ASARGS) -o $(BINDIR)/ds $(CMDSRC)/ds.s +# $(AS) $(ASARGS) -o $(BINDIR)/dskio $(CMDSRC)/dskio.s +# $(AS) $(ASARGS) -o $(BINDIR)/dskres $(CMDSRC)/dskres.s +# $(AS) $(ASARGS) -o $(BINDIR)/dsksav $(CMDSRC)/dsksav.s +# $(AS) $(ASARGS) -o $(BINDIR)/dsw $(CMDSRC)/dsw.s + $(AS) $(ASARGS) -o $(BINDIR)/ed $(CMDSRC)/ed1.s $(CMDSRC)/ed2.s + $(AS) $(ASARGS) -o $(BINDIR)/init $(CMDSRC)/init.s + +others: dirs + $(AS) $(ASARGS) -o $(BINDIR)/sh $(OTHERSRC)/pbsh.s + $(AS) $(ASARGS) -o $(BINDIR)/ls $(OTHERSRC)/wktls.s + $(AS) $(ASARGS) -o $(BINDIR)/wktcat $(OTHERSRC)/wktcat.s + $(AS) $(ASARGS) -o $(BINDIR)/wktcp $(OTHERSRC)/wktcp.s + $(AS) $(ASARGS) -o $(BINDIR)/date $(OTHERSRC)/wktdate.s + $(AS) $(ASARGS) -o $(BINDIR)/ln $(OTHERSRC)/wktln.s + $(AS) $(ASARGS) -o $(BINDIR)/ls $(OTHERSRC)/wktls.s + $(AS) $(ASARGS) -o $(BINDIR)/mv $(OTHERSRC)/wktmv.s + $(AS) $(ASARGS) -o $(BINDIR)/stat $(OTHERSRC)/wktstat.s