shithub: scc

Download patch

ref: 6c1eac285301e17024452e18e95e882ed758f3b0
parent: ccb6d42b0500f10c3647e2cd280f09e29abf01f3
author: Roberto E. Vargas Caballero <k0ga@shike2.com>
date: Sun Feb 10 07:20:44 EST 2019 

Fix dep generation


--- a/scripts/mkdep
+++ b/scripts/mkdep
@@ -7,14 +7,12 @@
 for i in `find . -name '*.c'`
 do
 	file=`basename $i | sed 's/\.c$/.o/'`
+	dir=`dirname $i`
 
-	dir=`dirname $i |
-	     sed -e 's,^\./,,' -e 's,^\.$,,' -e 's,...*[^/],&/,'`
-
 	sed -n "/^#include / {
 		s///
-		s@\"\(.*\)\"@$dir$file: $dir\1@p
-		s@<\(scc/.*\)>@$dir$file: \$(INCDIR)/scc/\1@p
+		s@\"\(.*\)\"@$dir/$file: $dir\1@p
+		s@<\(scc/.*\)>@$dir/$file: \$(INCDIR)/scc/\1@p
 	}" $i
 done | LC_ALL=C sort -s
 
--- a/src/cmd/Makefile
+++ b/src/cmd/Makefile
@@ -48,7 +48,7 @@
 
 dep: inc-dep
 
-clean:
+dep clean:
 	$(FORALL)
 
 include deps.mk
--- a/src/cmd/as/deps.mk
+++ b/src/cmd/as/deps.mk
@@ -1,30 +1,42 @@
 #deps
-expr.o: $(INCDIR)/scc/scc/scc.h
-expr.o: as.h
-ins.o: $(INCDIR)/scc/scc/scc.h
-ins.o: as.h
-main.o: $(INCDIR)/scc/scc/arg.h
-main.o: $(INCDIR)/scc/scc/scc.h
-main.o: as.h
-parser.o: $(INCDIR)/scc/scc/cstd.h
-parser.o: $(INCDIR)/scc/scc/scc.h
-parser.o: as.h
-symbol.o: $(INCDIR)/scc/scc/scc.h
-symbol.o: as.h
-target/x80/ins.o: $(INCDIR)/scc/scc/scc.h
-target/x80/ins.o: target/x80/../../as.h
-target/x80/ins.o: target/x80/proc.h
-target/x80/z80.o: $(INCDIR)/scc/scc/scc.h
-target/x80/z80.o: target/x80/../../as.h
-target/x80/z80.o: target/x80/../x80/proc.h
-target/x86/amd64.o: $(INCDIR)/scc/scc/scc.h
-target/x86/amd64.o: target/x86/../../as.h
-target/x86/i286.o: $(INCDIR)/scc/scc/scc.h
-target/x86/i286.o: target/x86/../../as.h
-target/x86/i286.o: target/x86/../x86/proc.h
-target/x86/i386.o: $(INCDIR)/scc/scc/scc.h
-target/x86/i386.o: target/x86/../../as.h
-target/x86/i386.o: target/x86/../x86/proc.h
-target/x86/ins.o: $(INCDIR)/scc/scc/scc.h
-target/x86/ins.o: target/x86/../../as.h
-target/x86/ins.o: target/x86/proc.h
+./expr.o: $(INCDIR)/scc/scc/scc.h
+./expr.o: .as.h
+./ins.o: $(INCDIR)/scc/scc/scc.h
+./ins.o: .as.h
+./main.o: $(INCDIR)/scc/scc/arg.h
+./main.o: $(INCDIR)/scc/scc/scc.h
+./main.o: .as.h
+./parser.o: $(INCDIR)/scc/scc/cstd.h
+./parser.o: $(INCDIR)/scc/scc/scc.h
+./parser.o: .as.h
+./symbol.o: $(INCDIR)/scc/scc/scc.h
+./symbol.o: .as.h
+./target/x80/ins.o: $(INCDIR)/scc/scc/scc.h
+./target/x80/ins.o: ./target/x80../../as.h
+./target/x80/ins.o: ./target/x80proc.h
+./target/x80/z80.o: $(INCDIR)/scc/scc/scc.h
+./target/x80/z80.o: ./target/x80../../as.h
+./target/x80/z80.o: ./target/x80../x80/proc.h
+./target/x80/z80tbl.o: $(INCDIR)/scc/scc/scc.h
+./target/x80/z80tbl.o: ./target/x80../../as.h
+./target/x80/z80tbl.o: ./target/x80../x80/proc.h
+./target/x86/amd64.o: $(INCDIR)/scc/scc/scc.h
+./target/x86/amd64.o: ./target/x86../../as.h
+./target/x86/amd64tbl.o: $(INCDIR)/scc/scc/scc.h
+./target/x86/amd64tbl.o: ./target/x86../../as.h
+./target/x86/amd64tbl.o: ./target/x86../x86/proc.h
+./target/x86/i286.o: $(INCDIR)/scc/scc/scc.h
+./target/x86/i286.o: ./target/x86../../as.h
+./target/x86/i286.o: ./target/x86../x86/proc.h
+./target/x86/i286tbl.o: $(INCDIR)/scc/scc/scc.h
+./target/x86/i286tbl.o: ./target/x86../../as.h
+./target/x86/i286tbl.o: ./target/x86../x86/proc.h
+./target/x86/i386.o: $(INCDIR)/scc/scc/scc.h
+./target/x86/i386.o: ./target/x86../../as.h
+./target/x86/i386.o: ./target/x86../x86/proc.h
+./target/x86/i386tbl.o: $(INCDIR)/scc/scc/scc.h
+./target/x86/i386tbl.o: ./target/x86../../as.h
+./target/x86/i386tbl.o: ./target/x86../x86/proc.h
+./target/x86/ins.o: $(INCDIR)/scc/scc/scc.h
+./target/x86/ins.o: ./target/x86../../as.h
+./target/x86/ins.o: ./target/x86proc.h
--- a/src/cmd/deps.mk
+++ b/src/cmd/deps.mk
@@ -1,176 +1,174 @@
 #deps
-addr2line.o: $(INCDIR)/scc/scc/arg.h
-addr2line.o: $(INCDIR)/scc/scc/mach.h
-ar.o: $(INCDIR)/scc/scc/ar.h
-ar.o: $(INCDIR)/scc/scc/arg.h
-ar.o: sys.h
-as/target/x80/ins.o: $(INCDIR)/scc/scc/scc.h
-as/target/x80/ins.o: as/target/x80/../../as.h
-as/target/x80/ins.o: as/target/x80/proc.h
-as/target/x80/z80.o: $(INCDIR)/scc/scc/scc.h
-as/target/x80/z80.o: as/target/x80/../../as.h
-as/target/x80/z80.o: as/target/x80/../x80/proc.h
-as/target/x80/z80tbl.o: $(INCDIR)/scc/scc/scc.h
-as/target/x80/z80tbl.o: as/target/x80/../../as.h
-as/target/x80/z80tbl.o: as/target/x80/../x80/proc.h
-as/target/x86/amd64.o: $(INCDIR)/scc/scc/scc.h
-as/target/x86/amd64.o: as/target/x86/../../as.h
-as/target/x86/amd64tbl.o: $(INCDIR)/scc/scc/scc.h
-as/target/x86/amd64tbl.o: as/target/x86/../../as.h
-as/target/x86/amd64tbl.o: as/target/x86/../x86/proc.h
-as/target/x86/i286.o: $(INCDIR)/scc/scc/scc.h
-as/target/x86/i286.o: as/target/x86/../../as.h
-as/target/x86/i286.o: as/target/x86/../x86/proc.h
-as/target/x86/i286tbl.o: $(INCDIR)/scc/scc/scc.h
-as/target/x86/i286tbl.o: as/target/x86/../../as.h
-as/target/x86/i286tbl.o: as/target/x86/../x86/proc.h
-as/target/x86/i386.o: $(INCDIR)/scc/scc/scc.h
-as/target/x86/i386.o: as/target/x86/../../as.h
-as/target/x86/i386.o: as/target/x86/../x86/proc.h
-as/target/x86/i386tbl.o: $(INCDIR)/scc/scc/scc.h
-as/target/x86/i386tbl.o: as/target/x86/../../as.h
-as/target/x86/i386tbl.o: as/target/x86/../x86/proc.h
-as/target/x86/ins.o: $(INCDIR)/scc/scc/scc.h
-as/target/x86/ins.o: as/target/x86/../../as.h
-as/target/x86/ins.o: as/target/x86/proc.h
-asexpr.o: $(INCDIR)/scc/scc/scc.h
-asexpr.o: asas.h
-asins.o: $(INCDIR)/scc/scc/scc.h
-asins.o: asas.h
-asmain.o: $(INCDIR)/scc/scc/arg.h
-asmain.o: $(INCDIR)/scc/scc/scc.h
-asmain.o: asas.h
-asparser.o: $(INCDIR)/scc/scc/cstd.h
-asparser.o: $(INCDIR)/scc/scc/scc.h
-asparser.o: asas.h
-assymbol.o: $(INCDIR)/scc/scc/scc.h
-assymbol.o: asas.h
-ldmain.o: $(INCDIR)/scc/scc/ar.h
-ldmain.o: $(INCDIR)/scc/scc/scc.h
-ldmain.o: $(INCDIR)/scc/scc/syslibs.h
-ldmain.o: ldld.h
-ldobj.o: $(INCDIR)/scc/scc/scc.h
-ldobj.o: ldld.h
-nm.o: $(INCDIR)/scc/scc/arg.h
-nm.o: $(INCDIR)/scc/scc/mach.h
-objdump.o: $(INCDIR)/scc/scc/arg.h
-objdump.o: $(INCDIR)/scc/scc/mach.h
-posix.o: sys.h
-ranlib.o: $(INCDIR)/scc/scc/ar.h
-ranlib.o: $(INCDIR)/scc/scc/arg.h
-ranlib.o: $(INCDIR)/scc/scc/mach.h
-ranlib.o: sys.h
-scc/cc1/builtin.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/builtin.o: scc/cc1/cc1.h
-scc/cc1/code.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/code.o: scc/cc1/cc1.h
-scc/cc1/cpp.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/cpp.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/cpp.o: scc/cc1/cc1.h
-scc/cc1/decl.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/decl.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/decl.o: scc/cc1/cc1.h
-scc/cc1/error.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/error.o: scc/cc1/cc1.h
-scc/cc1/expr.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/expr.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/expr.o: scc/cc1/cc1.h
-scc/cc1/fold.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/fold.o: scc/cc1/cc1.h
-scc/cc1/init.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/init.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/init.o: scc/cc1/cc1.h
-scc/cc1/lex.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/lex.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/lex.o: scc/cc1/cc1.h
-scc/cc1/main.o: $(INCDIR)/scc/scc/arg.h
-scc/cc1/main.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/main.o: scc/cc1/cc1.h
-scc/cc1/stmt.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/stmt.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/stmt.o: scc/cc1/cc1.h
-scc/cc1/symbol.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/symbol.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/symbol.o: scc/cc1/cc1.h
-scc/cc1/target/amd64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/target/amd64-sysv/arch.o: scc/cc1/target/amd64-sysv/../../cc1.h
-scc/cc1/target/arm64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/target/arm64-sysv/arch.o: scc/cc1/target/arm64-sysv/../../cc1.h
-scc/cc1/target/i386-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/target/i386-sysv/arch.o: scc/cc1/target/i386-sysv/../../cc1.h
-scc/cc1/target/z80-scc/arch.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/target/z80-scc/arch.o: scc/cc1/target/z80-scc/../../cc1.h
-scc/cc1/types.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc1/types.o: $(INCDIR)/scc/scc/scc.h
-scc/cc1/types.o: scc/cc1/cc1.h
-scc/cc2/code.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/code.o: scc/cc2/cc2.h
-scc/cc2/main.o: $(INCDIR)/scc/scc/arg.h
-scc/cc2/main.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/main.o: scc/cc2/cc2.h
-scc/cc2/main.o: scc/cc2/error.h
-scc/cc2/node.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/node.o: scc/cc2/cc2.h
-scc/cc2/optm.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/optm.o: scc/cc2/cc2.h
-scc/cc2/parser.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc2/parser.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/parser.o: scc/cc2/cc2.h
-scc/cc2/peep.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/peep.o: scc/cc2/cc2.h
-scc/cc2/symbol.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/symbol.o: scc/cc2/cc2.h
-scc/cc2/target/amd64-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/amd64-sysv/cgen.o: scc/cc2/target/amd64-sysv/../../cc2.h
-scc/cc2/target/amd64-sysv/cgen.o: scc/cc2/target/amd64-sysv/arch.h
-scc/cc2/target/amd64-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc2/target/amd64-sysv/code.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/amd64-sysv/code.o: scc/cc2/target/amd64-sysv/../../cc2.h
-scc/cc2/target/amd64-sysv/code.o: scc/cc2/target/amd64-sysv/arch.h
-scc/cc2/target/amd64-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/amd64-sysv/optm.o: scc/cc2/target/amd64-sysv/../../cc2.h
-scc/cc2/target/amd64-sysv/types.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/amd64-sysv/types.o: scc/cc2/target/amd64-sysv/../../cc2.h
-scc/cc2/target/i386-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/i386-sysv/cgen.o: scc/cc2/target/i386-sysv/../../cc2.h
-scc/cc2/target/i386-sysv/cgen.o: scc/cc2/target/i386-sysv/arch.h
-scc/cc2/target/i386-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc2/target/i386-sysv/code.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/i386-sysv/code.o: scc/cc2/target/i386-sysv/../../cc2.h
-scc/cc2/target/i386-sysv/code.o: scc/cc2/target/i386-sysv/arch.h
-scc/cc2/target/i386-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/i386-sysv/optm.o: scc/cc2/target/i386-sysv/../../cc2.h
-scc/cc2/target/i386-sysv/types.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/i386-sysv/types.o: scc/cc2/target/i386-sysv/../../cc2.h
-scc/cc2/target/qbe/cgen.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc2/target/qbe/cgen.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/qbe/cgen.o: scc/cc2/target/qbe/../../cc2.h
-scc/cc2/target/qbe/cgen.o: scc/cc2/target/qbe/arch.h
-scc/cc2/target/qbe/code.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc2/target/qbe/code.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/qbe/code.o: scc/cc2/target/qbe/../../cc2.h
-scc/cc2/target/qbe/code.o: scc/cc2/target/qbe/arch.h
-scc/cc2/target/qbe/optm.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/qbe/optm.o: scc/cc2/target/qbe/../../cc2.h
-scc/cc2/target/z80-scc/cgen.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/z80-scc/cgen.o: scc/cc2/target/z80-scc/../../cc2.h
-scc/cc2/target/z80-scc/cgen.o: scc/cc2/target/z80-scc/arch.h
-scc/cc2/target/z80-scc/code.o: $(INCDIR)/scc/scc/cstd.h
-scc/cc2/target/z80-scc/code.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/z80-scc/code.o: scc/cc2/target/z80-scc/../../cc2.h
-scc/cc2/target/z80-scc/code.o: scc/cc2/target/z80-scc/arch.h
-scc/cc2/target/z80-scc/optm.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/z80-scc/optm.o: scc/cc2/target/z80-scc/../../cc2.h
-scc/cc2/target/z80-scc/types.o: $(INCDIR)/scc/scc/scc.h
-scc/cc2/target/z80-scc/types.o: scc/cc2/target/z80-scc/../../cc2.h
-scc/posix/scc.o: $(INCDIR)/scc/scc/arg.h
-scc/posix/scc.o: $(INCDIR)/scc/scc/ldflags.h
-scc/posix/scc.o: $(INCDIR)/scc/scc/scc.h
-scc/posix/scc.o: $(INCDIR)/scc/scc/syscrts.h
-scc/posix/scc.o: $(INCDIR)/scc/scc/sysincludes.h
-scc/posix/scc.o: $(INCDIR)/scc/scc/syslibs.h
-scc/posix/scc.o: scc/posix/config.h
-size.o: $(INCDIR)/scc/scc/arg.h
-size.o: $(INCDIR)/scc/scc/mach.h
-strip.o: $(INCDIR)/scc/scc/arg.h
-strip.o: $(INCDIR)/scc/scc/mach.h
+./addr2line.o: $(INCDIR)/scc/scc/arg.h
+./addr2line.o: $(INCDIR)/scc/scc/mach.h
+./ar.o: $(INCDIR)/scc/scc/ar.h
+./ar.o: $(INCDIR)/scc/scc/arg.h
+./ar.o: .sys.h
+./as/expr.o: $(INCDIR)/scc/scc/scc.h
+./as/expr.o: ./asas.h
+./as/ins.o: $(INCDIR)/scc/scc/scc.h
+./as/ins.o: ./asas.h
+./as/main.o: $(INCDIR)/scc/scc/arg.h
+./as/main.o: $(INCDIR)/scc/scc/scc.h
+./as/main.o: ./asas.h
+./as/parser.o: $(INCDIR)/scc/scc/cstd.h
+./as/parser.o: $(INCDIR)/scc/scc/scc.h
+./as/parser.o: ./asas.h
+./as/symbol.o: $(INCDIR)/scc/scc/scc.h
+./as/symbol.o: ./asas.h
+./as/target/x80/ins.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x80/ins.o: ./as/target/x80../../as.h
+./as/target/x80/ins.o: ./as/target/x80proc.h
+./as/target/x80/z80.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x80/z80.o: ./as/target/x80../../as.h
+./as/target/x80/z80.o: ./as/target/x80../x80/proc.h
+./as/target/x80/z80tbl.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x80/z80tbl.o: ./as/target/x80../../as.h
+./as/target/x80/z80tbl.o: ./as/target/x80../x80/proc.h
+./as/target/x86/amd64.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x86/amd64.o: ./as/target/x86../../as.h
+./as/target/x86/amd64tbl.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x86/amd64tbl.o: ./as/target/x86../../as.h
+./as/target/x86/amd64tbl.o: ./as/target/x86../x86/proc.h
+./as/target/x86/i286.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x86/i286.o: ./as/target/x86../../as.h
+./as/target/x86/i286.o: ./as/target/x86../x86/proc.h
+./as/target/x86/i286tbl.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x86/i286tbl.o: ./as/target/x86../../as.h
+./as/target/x86/i286tbl.o: ./as/target/x86../x86/proc.h
+./as/target/x86/i386.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x86/i386.o: ./as/target/x86../../as.h
+./as/target/x86/i386.o: ./as/target/x86../x86/proc.h
+./as/target/x86/i386tbl.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x86/i386tbl.o: ./as/target/x86../../as.h
+./as/target/x86/i386tbl.o: ./as/target/x86../x86/proc.h
+./as/target/x86/ins.o: $(INCDIR)/scc/scc/scc.h
+./as/target/x86/ins.o: ./as/target/x86../../as.h
+./as/target/x86/ins.o: ./as/target/x86proc.h
+./ld/main.o: $(INCDIR)/scc/scc/ar.h
+./ld/main.o: $(INCDIR)/scc/scc/mach.h
+./ld/main.o: $(INCDIR)/scc/scc/scc.h
+./ld/main.o: $(INCDIR)/scc/scc/syslibs.h
+./nm.o: $(INCDIR)/scc/scc/arg.h
+./nm.o: $(INCDIR)/scc/scc/mach.h
+./objdump.o: $(INCDIR)/scc/scc/arg.h
+./objdump.o: $(INCDIR)/scc/scc/mach.h
+./posix.o: .sys.h
+./ranlib.o: $(INCDIR)/scc/scc/ar.h
+./ranlib.o: $(INCDIR)/scc/scc/arg.h
+./ranlib.o: $(INCDIR)/scc/scc/mach.h
+./ranlib.o: .sys.h
+./scc/cc1/builtin.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/builtin.o: ./scc/cc1cc1.h
+./scc/cc1/code.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/code.o: ./scc/cc1cc1.h
+./scc/cc1/cpp.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/cpp.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/cpp.o: ./scc/cc1cc1.h
+./scc/cc1/decl.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/decl.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/decl.o: ./scc/cc1cc1.h
+./scc/cc1/error.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/error.o: ./scc/cc1cc1.h
+./scc/cc1/expr.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/expr.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/expr.o: ./scc/cc1cc1.h
+./scc/cc1/fold.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/fold.o: ./scc/cc1cc1.h
+./scc/cc1/init.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/init.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/init.o: ./scc/cc1cc1.h
+./scc/cc1/lex.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/lex.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/lex.o: ./scc/cc1cc1.h
+./scc/cc1/main.o: $(INCDIR)/scc/scc/arg.h
+./scc/cc1/main.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/main.o: ./scc/cc1cc1.h
+./scc/cc1/stmt.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/stmt.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/stmt.o: ./scc/cc1cc1.h
+./scc/cc1/symbol.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/symbol.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/symbol.o: ./scc/cc1cc1.h
+./scc/cc1/target/amd64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/target/amd64-sysv/arch.o: ./scc/cc1/target/amd64-sysv../../cc1.h
+./scc/cc1/target/arm64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/target/arm64-sysv/arch.o: ./scc/cc1/target/arm64-sysv../../cc1.h
+./scc/cc1/target/i386-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/target/i386-sysv/arch.o: ./scc/cc1/target/i386-sysv../../cc1.h
+./scc/cc1/target/z80-scc/arch.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/target/z80-scc/arch.o: ./scc/cc1/target/z80-scc../../cc1.h
+./scc/cc1/types.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc1/types.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc1/types.o: ./scc/cc1cc1.h
+./scc/cc2/code.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/code.o: ./scc/cc2cc2.h
+./scc/cc2/main.o: $(INCDIR)/scc/scc/arg.h
+./scc/cc2/main.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/main.o: ./scc/cc2cc2.h
+./scc/cc2/main.o: ./scc/cc2error.h
+./scc/cc2/node.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/node.o: ./scc/cc2cc2.h
+./scc/cc2/optm.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/optm.o: ./scc/cc2cc2.h
+./scc/cc2/parser.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc2/parser.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/parser.o: ./scc/cc2cc2.h
+./scc/cc2/peep.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/peep.o: ./scc/cc2cc2.h
+./scc/cc2/symbol.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/symbol.o: ./scc/cc2cc2.h
+./scc/cc2/target/amd64-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/amd64-sysv/cgen.o: ./scc/cc2/target/amd64-sysv../../cc2.h
+./scc/cc2/target/amd64-sysv/cgen.o: ./scc/cc2/target/amd64-sysvarch.h
+./scc/cc2/target/amd64-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc2/target/amd64-sysv/code.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/amd64-sysv/code.o: ./scc/cc2/target/amd64-sysv../../cc2.h
+./scc/cc2/target/amd64-sysv/code.o: ./scc/cc2/target/amd64-sysvarch.h
+./scc/cc2/target/amd64-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/amd64-sysv/optm.o: ./scc/cc2/target/amd64-sysv../../cc2.h
+./scc/cc2/target/amd64-sysv/types.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/amd64-sysv/types.o: ./scc/cc2/target/amd64-sysv../../cc2.h
+./scc/cc2/target/i386-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/i386-sysv/cgen.o: ./scc/cc2/target/i386-sysv../../cc2.h
+./scc/cc2/target/i386-sysv/cgen.o: ./scc/cc2/target/i386-sysvarch.h
+./scc/cc2/target/i386-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc2/target/i386-sysv/code.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/i386-sysv/code.o: ./scc/cc2/target/i386-sysv../../cc2.h
+./scc/cc2/target/i386-sysv/code.o: ./scc/cc2/target/i386-sysvarch.h
+./scc/cc2/target/i386-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/i386-sysv/optm.o: ./scc/cc2/target/i386-sysv../../cc2.h
+./scc/cc2/target/i386-sysv/types.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/i386-sysv/types.o: ./scc/cc2/target/i386-sysv../../cc2.h
+./scc/cc2/target/qbe/cgen.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc2/target/qbe/cgen.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/qbe/cgen.o: ./scc/cc2/target/qbe../../cc2.h
+./scc/cc2/target/qbe/cgen.o: ./scc/cc2/target/qbearch.h
+./scc/cc2/target/qbe/code.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc2/target/qbe/code.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/qbe/code.o: ./scc/cc2/target/qbe../../cc2.h
+./scc/cc2/target/qbe/code.o: ./scc/cc2/target/qbearch.h
+./scc/cc2/target/qbe/optm.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/qbe/optm.o: ./scc/cc2/target/qbe../../cc2.h
+./scc/cc2/target/z80-scc/cgen.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/z80-scc/cgen.o: ./scc/cc2/target/z80-scc../../cc2.h
+./scc/cc2/target/z80-scc/cgen.o: ./scc/cc2/target/z80-sccarch.h
+./scc/cc2/target/z80-scc/code.o: $(INCDIR)/scc/scc/cstd.h
+./scc/cc2/target/z80-scc/code.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/z80-scc/code.o: ./scc/cc2/target/z80-scc../../cc2.h
+./scc/cc2/target/z80-scc/code.o: ./scc/cc2/target/z80-sccarch.h
+./scc/cc2/target/z80-scc/optm.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/z80-scc/optm.o: ./scc/cc2/target/z80-scc../../cc2.h
+./scc/cc2/target/z80-scc/types.o: $(INCDIR)/scc/scc/scc.h
+./scc/cc2/target/z80-scc/types.o: ./scc/cc2/target/z80-scc../../cc2.h
+./scc/posix/scc.o: $(INCDIR)/scc/scc/arg.h
+./scc/posix/scc.o: $(INCDIR)/scc/scc/ldflags.h
+./scc/posix/scc.o: $(INCDIR)/scc/scc/scc.h
+./scc/posix/scc.o: $(INCDIR)/scc/scc/syscrts.h
+./scc/posix/scc.o: $(INCDIR)/scc/scc/sysincludes.h
+./scc/posix/scc.o: $(INCDIR)/scc/scc/syslibs.h
+./scc/posix/scc.o: ./scc/posixconfig.h
+./size.o: $(INCDIR)/scc/scc/arg.h
+./size.o: $(INCDIR)/scc/scc/mach.h
+./strip.o: $(INCDIR)/scc/scc/arg.h
+./strip.o: $(INCDIR)/scc/scc/mach.h
--- a/src/cmd/ld/deps.mk
+++ b/src/cmd/ld/deps.mk
@@ -1,8 +1,5 @@
-
 #deps
-main.o: $(INCDIR)/scc/scc/ar.h
-main.o: $(INCDIR)/scc/scc/scc.h
-main.o: $(INCDIR)/scc/scc/syslibs.h
-main.o: ld.h
-obj.o: $(INCDIR)/scc/scc/scc.h
-obj.o: ld.h
+./main.o: $(INCDIR)/scc/scc/ar.h
+./main.o: $(INCDIR)/scc/scc/mach.h
+./main.o: $(INCDIR)/scc/scc/scc.h
+./main.o: $(INCDIR)/scc/scc/syslibs.h
--- a/src/cmd/scc/Makefile
+++ b/src/cmd/scc/Makefile
@@ -10,5 +10,5 @@
 $(DIRS): FORCE
 	+@cd $@ && $(MAKE)
 
-clean:
+dep clean:
 	$(FORALL)
--- a/src/cmd/scc/cc1/deps.mk
+++ b/src/cmd/scc/cc1/deps.mk
@@ -1,44 +1,44 @@
 #deps
-builtin.o: $(INCDIR)/scc/scc/scc.h
-builtin.o: cc1.h
-code.o: $(INCDIR)/scc/scc/scc.h
-code.o: cc1.h
-cpp.o: $(INCDIR)/scc/scc/cstd.h
-cpp.o: $(INCDIR)/scc/scc/scc.h
-cpp.o: cc1.h
-decl.o: $(INCDIR)/scc/scc/cstd.h
-decl.o: $(INCDIR)/scc/scc/scc.h
-decl.o: cc1.h
-error.o: $(INCDIR)/scc/scc/scc.h
-error.o: cc1.h
-expr.o: $(INCDIR)/scc/scc/cstd.h
-expr.o: $(INCDIR)/scc/scc/scc.h
-expr.o: cc1.h
-fold.o: $(INCDIR)/scc/scc/scc.h
-fold.o: cc1.h
-init.o: $(INCDIR)/scc/scc/cstd.h
-init.o: $(INCDIR)/scc/scc/scc.h
-init.o: cc1.h
-lex.o: $(INCDIR)/scc/scc/cstd.h
-lex.o: $(INCDIR)/scc/scc/scc.h
-lex.o: cc1.h
-main.o: $(INCDIR)/scc/scc/arg.h
-main.o: $(INCDIR)/scc/scc/scc.h
-main.o: cc1.h
-stmt.o: $(INCDIR)/scc/scc/cstd.h
-stmt.o: $(INCDIR)/scc/scc/scc.h
-stmt.o: cc1.h
-symbol.o: $(INCDIR)/scc/scc/cstd.h
-symbol.o: $(INCDIR)/scc/scc/scc.h
-symbol.o: cc1.h
-target/amd64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
-target/amd64-sysv/arch.o: target/amd64-sysv/../../cc1.h
-target/arm64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
-target/arm64-sysv/arch.o: target/arm64-sysv/../../cc1.h
-target/i386-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
-target/i386-sysv/arch.o: target/i386-sysv/../../cc1.h
-target/z80-scc/arch.o: $(INCDIR)/scc/scc/scc.h
-target/z80-scc/arch.o: target/z80-scc/../../cc1.h
-types.o: $(INCDIR)/scc/scc/cstd.h
-types.o: $(INCDIR)/scc/scc/scc.h
-types.o: cc1.h
+./builtin.o: $(INCDIR)/scc/scc/scc.h
+./builtin.o: .cc1.h
+./code.o: $(INCDIR)/scc/scc/scc.h
+./code.o: .cc1.h
+./cpp.o: $(INCDIR)/scc/scc/cstd.h
+./cpp.o: $(INCDIR)/scc/scc/scc.h
+./cpp.o: .cc1.h
+./decl.o: $(INCDIR)/scc/scc/cstd.h
+./decl.o: $(INCDIR)/scc/scc/scc.h
+./decl.o: .cc1.h
+./error.o: $(INCDIR)/scc/scc/scc.h
+./error.o: .cc1.h
+./expr.o: $(INCDIR)/scc/scc/cstd.h
+./expr.o: $(INCDIR)/scc/scc/scc.h
+./expr.o: .cc1.h
+./fold.o: $(INCDIR)/scc/scc/scc.h
+./fold.o: .cc1.h
+./init.o: $(INCDIR)/scc/scc/cstd.h
+./init.o: $(INCDIR)/scc/scc/scc.h
+./init.o: .cc1.h
+./lex.o: $(INCDIR)/scc/scc/cstd.h
+./lex.o: $(INCDIR)/scc/scc/scc.h
+./lex.o: .cc1.h
+./main.o: $(INCDIR)/scc/scc/arg.h
+./main.o: $(INCDIR)/scc/scc/scc.h
+./main.o: .cc1.h
+./stmt.o: $(INCDIR)/scc/scc/cstd.h
+./stmt.o: $(INCDIR)/scc/scc/scc.h
+./stmt.o: .cc1.h
+./symbol.o: $(INCDIR)/scc/scc/cstd.h
+./symbol.o: $(INCDIR)/scc/scc/scc.h
+./symbol.o: .cc1.h
+./target/amd64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
+./target/amd64-sysv/arch.o: ./target/amd64-sysv../../cc1.h
+./target/arm64-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
+./target/arm64-sysv/arch.o: ./target/arm64-sysv../../cc1.h
+./target/i386-sysv/arch.o: $(INCDIR)/scc/scc/scc.h
+./target/i386-sysv/arch.o: ./target/i386-sysv../../cc1.h
+./target/z80-scc/arch.o: $(INCDIR)/scc/scc/scc.h
+./target/z80-scc/arch.o: ./target/z80-scc../../cc1.h
+./types.o: $(INCDIR)/scc/scc/cstd.h
+./types.o: $(INCDIR)/scc/scc/scc.h
+./types.o: .cc1.h
--- a/src/cmd/scc/cc2/deps.mk
+++ b/src/cmd/scc/cc2/deps.mk
@@ -1,61 +1,61 @@
 #deps
-code.o: $(INCDIR)/scc/scc/scc.h
-code.o: cc2.h
-main.o: $(INCDIR)/scc/scc/arg.h
-main.o: $(INCDIR)/scc/scc/scc.h
-main.o: cc2.h
-main.o: error.h
-node.o: $(INCDIR)/scc/scc/scc.h
-node.o: cc2.h
-optm.o: $(INCDIR)/scc/scc/scc.h
-optm.o: cc2.h
-parser.o: $(INCDIR)/scc/scc/cstd.h
-parser.o: $(INCDIR)/scc/scc/scc.h
-parser.o: cc2.h
-peep.o: $(INCDIR)/scc/scc/scc.h
-peep.o: cc2.h
-symbol.o: $(INCDIR)/scc/scc/scc.h
-symbol.o: cc2.h
-target/amd64-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
-target/amd64-sysv/cgen.o: target/amd64-sysv/../../cc2.h
-target/amd64-sysv/cgen.o: target/amd64-sysv/arch.h
-target/amd64-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
-target/amd64-sysv/code.o: $(INCDIR)/scc/scc/scc.h
-target/amd64-sysv/code.o: target/amd64-sysv/../../cc2.h
-target/amd64-sysv/code.o: target/amd64-sysv/arch.h
-target/amd64-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
-target/amd64-sysv/optm.o: target/amd64-sysv/../../cc2.h
-target/amd64-sysv/types.o: $(INCDIR)/scc/scc/scc.h
-target/amd64-sysv/types.o: target/amd64-sysv/../../cc2.h
-target/i386-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
-target/i386-sysv/cgen.o: target/i386-sysv/../../cc2.h
-target/i386-sysv/cgen.o: target/i386-sysv/arch.h
-target/i386-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
-target/i386-sysv/code.o: $(INCDIR)/scc/scc/scc.h
-target/i386-sysv/code.o: target/i386-sysv/../../cc2.h
-target/i386-sysv/code.o: target/i386-sysv/arch.h
-target/i386-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
-target/i386-sysv/optm.o: target/i386-sysv/../../cc2.h
-target/i386-sysv/types.o: $(INCDIR)/scc/scc/scc.h
-target/i386-sysv/types.o: target/i386-sysv/../../cc2.h
-target/qbe/cgen.o: $(INCDIR)/scc/scc/cstd.h
-target/qbe/cgen.o: $(INCDIR)/scc/scc/scc.h
-target/qbe/cgen.o: target/qbe/../../cc2.h
-target/qbe/cgen.o: target/qbe/arch.h
-target/qbe/code.o: $(INCDIR)/scc/scc/cstd.h
-target/qbe/code.o: $(INCDIR)/scc/scc/scc.h
-target/qbe/code.o: target/qbe/../../cc2.h
-target/qbe/code.o: target/qbe/arch.h
-target/qbe/optm.o: $(INCDIR)/scc/scc/scc.h
-target/qbe/optm.o: target/qbe/../../cc2.h
-target/z80-scc/cgen.o: $(INCDIR)/scc/scc/scc.h
-target/z80-scc/cgen.o: target/z80-scc/../../cc2.h
-target/z80-scc/cgen.o: target/z80-scc/arch.h
-target/z80-scc/code.o: $(INCDIR)/scc/scc/cstd.h
-target/z80-scc/code.o: $(INCDIR)/scc/scc/scc.h
-target/z80-scc/code.o: target/z80-scc/../../cc2.h
-target/z80-scc/code.o: target/z80-scc/arch.h
-target/z80-scc/optm.o: $(INCDIR)/scc/scc/scc.h
-target/z80-scc/optm.o: target/z80-scc/../../cc2.h
-target/z80-scc/types.o: $(INCDIR)/scc/scc/scc.h
-target/z80-scc/types.o: target/z80-scc/../../cc2.h
+./code.o: $(INCDIR)/scc/scc/scc.h
+./code.o: .cc2.h
+./main.o: $(INCDIR)/scc/scc/arg.h
+./main.o: $(INCDIR)/scc/scc/scc.h
+./main.o: .cc2.h
+./main.o: .error.h
+./node.o: $(INCDIR)/scc/scc/scc.h
+./node.o: .cc2.h
+./optm.o: $(INCDIR)/scc/scc/scc.h
+./optm.o: .cc2.h
+./parser.o: $(INCDIR)/scc/scc/cstd.h
+./parser.o: $(INCDIR)/scc/scc/scc.h
+./parser.o: .cc2.h
+./peep.o: $(INCDIR)/scc/scc/scc.h
+./peep.o: .cc2.h
+./symbol.o: $(INCDIR)/scc/scc/scc.h
+./symbol.o: .cc2.h
+./target/amd64-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
+./target/amd64-sysv/cgen.o: ./target/amd64-sysv../../cc2.h
+./target/amd64-sysv/cgen.o: ./target/amd64-sysvarch.h
+./target/amd64-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
+./target/amd64-sysv/code.o: $(INCDIR)/scc/scc/scc.h
+./target/amd64-sysv/code.o: ./target/amd64-sysv../../cc2.h
+./target/amd64-sysv/code.o: ./target/amd64-sysvarch.h
+./target/amd64-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
+./target/amd64-sysv/optm.o: ./target/amd64-sysv../../cc2.h
+./target/amd64-sysv/types.o: $(INCDIR)/scc/scc/scc.h
+./target/amd64-sysv/types.o: ./target/amd64-sysv../../cc2.h
+./target/i386-sysv/cgen.o: $(INCDIR)/scc/scc/scc.h
+./target/i386-sysv/cgen.o: ./target/i386-sysv../../cc2.h
+./target/i386-sysv/cgen.o: ./target/i386-sysvarch.h
+./target/i386-sysv/code.o: $(INCDIR)/scc/scc/cstd.h
+./target/i386-sysv/code.o: $(INCDIR)/scc/scc/scc.h
+./target/i386-sysv/code.o: ./target/i386-sysv../../cc2.h
+./target/i386-sysv/code.o: ./target/i386-sysvarch.h
+./target/i386-sysv/optm.o: $(INCDIR)/scc/scc/scc.h
+./target/i386-sysv/optm.o: ./target/i386-sysv../../cc2.h
+./target/i386-sysv/types.o: $(INCDIR)/scc/scc/scc.h
+./target/i386-sysv/types.o: ./target/i386-sysv../../cc2.h
+./target/qbe/cgen.o: $(INCDIR)/scc/scc/cstd.h
+./target/qbe/cgen.o: $(INCDIR)/scc/scc/scc.h
+./target/qbe/cgen.o: ./target/qbe../../cc2.h
+./target/qbe/cgen.o: ./target/qbearch.h
+./target/qbe/code.o: $(INCDIR)/scc/scc/cstd.h
+./target/qbe/code.o: $(INCDIR)/scc/scc/scc.h
+./target/qbe/code.o: ./target/qbe../../cc2.h
+./target/qbe/code.o: ./target/qbearch.h
+./target/qbe/optm.o: $(INCDIR)/scc/scc/scc.h
+./target/qbe/optm.o: ./target/qbe../../cc2.h
+./target/z80-scc/cgen.o: $(INCDIR)/scc/scc/scc.h
+./target/z80-scc/cgen.o: ./target/z80-scc../../cc2.h
+./target/z80-scc/cgen.o: ./target/z80-sccarch.h
+./target/z80-scc/code.o: $(INCDIR)/scc/scc/cstd.h
+./target/z80-scc/code.o: $(INCDIR)/scc/scc/scc.h
+./target/z80-scc/code.o: ./target/z80-scc../../cc2.h
+./target/z80-scc/code.o: ./target/z80-sccarch.h
+./target/z80-scc/optm.o: $(INCDIR)/scc/scc/scc.h
+./target/z80-scc/optm.o: ./target/z80-scc../../cc2.h
+./target/z80-scc/types.o: $(INCDIR)/scc/scc/scc.h
+./target/z80-scc/types.o: ./target/z80-scc../../cc2.h
--- a/src/cmd/scc/posix/deps.mk
+++ b/src/cmd/scc/posix/deps.mk
@@ -1,8 +1,8 @@
 #deps
-scc.o: $(INCDIR)/scc/scc/arg.h
-scc.o: $(INCDIR)/scc/scc/ldflags.h
-scc.o: $(INCDIR)/scc/scc/scc.h
-scc.o: $(INCDIR)/scc/scc/syscrts.h
-scc.o: $(INCDIR)/scc/scc/sysincludes.h
-scc.o: $(INCDIR)/scc/scc/syslibs.h
-scc.o: config.h
+./scc.o: $(INCDIR)/scc/scc/arg.h
+./scc.o: $(INCDIR)/scc/scc/ldflags.h
+./scc.o: $(INCDIR)/scc/scc/scc.h
+./scc.o: $(INCDIR)/scc/scc/syscrts.h
+./scc.o: $(INCDIR)/scc/scc/sysincludes.h
+./scc.o: $(INCDIR)/scc/scc/syslibs.h
+./scc.o: .config.h
--- a/src/libmach/coff32/deps.mk
+++ b/src/libmach/coff32/deps.mk
@@ -1,22 +1,22 @@
 #deps
-coff32del.o: $(INCDIR)/scc/scc/mach.h
-coff32del.o: ../libmach.h
-coff32del.o: coff32.h
-coff32index.o: $(INCDIR)/scc/scc/mach.h
-coff32index.o: ../libmach.h
-coff32index.o: coff32.h
-coff32new.o: $(INCDIR)/scc/scc/mach.h
-coff32new.o: ../libmach.h
-coff32new.o: coff32.h
-coff32probe.o: $(INCDIR)/scc/scc/mach.h
-coff32probe.o: ../libmach.h
-coff32probe.o: coff32.h
-coff32read.o: $(INCDIR)/scc/scc/mach.h
-coff32read.o: ../libmach.h
-coff32read.o: coff32.h
-coff32strip.o: $(INCDIR)/scc/scc/mach.h
-coff32strip.o: ../libmach.h
-coff32strip.o: coff32.h
-coff32write.o: $(INCDIR)/scc/scc/mach.h
-coff32write.o: ../libmach.h
-coff32write.o: coff32.h
+./coff32del.o: $(INCDIR)/scc/scc/mach.h
+./coff32del.o: .../libmach.h
+./coff32del.o: .coff32.h
+./coff32index.o: $(INCDIR)/scc/scc/mach.h
+./coff32index.o: .../libmach.h
+./coff32index.o: .coff32.h
+./coff32new.o: $(INCDIR)/scc/scc/mach.h
+./coff32new.o: .../libmach.h
+./coff32new.o: .coff32.h
+./coff32probe.o: $(INCDIR)/scc/scc/mach.h
+./coff32probe.o: .../libmach.h
+./coff32probe.o: .coff32.h
+./coff32read.o: $(INCDIR)/scc/scc/mach.h
+./coff32read.o: .../libmach.h
+./coff32read.o: .coff32.h
+./coff32strip.o: $(INCDIR)/scc/scc/mach.h
+./coff32strip.o: .../libmach.h
+./coff32strip.o: .coff32.h
+./coff32write.o: $(INCDIR)/scc/scc/mach.h
+./coff32write.o: .../libmach.h
+./coff32write.o: .coff32.h
--- a/src/libmach/deps.mk
+++ b/src/libmach/deps.mk
@@ -1,75 +1,77 @@
 #deps
-addr2line.o: $(INCDIR)/scc/scc/mach.h
-archive.o: $(INCDIR)/scc/scc/ar.h
-archive.o: $(INCDIR)/scc/scc/mach.h
-archive.o: libmach.h
-arindex.o: $(INCDIR)/scc/scc/mach.h
-arindex.o: libmach.h
-armember.o: $(INCDIR)/scc/scc/ar.h
-armember.o: $(INCDIR)/scc/scc/mach.h
-artraverse.o: $(INCDIR)/scc/scc/ar.h
-artraverse.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32del.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32del.o: coff32/../libmach.h
-coff32/coff32del.o: coff32/coff32.h
-coff32/coff32index.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32index.o: coff32/../libmach.h
-coff32/coff32index.o: coff32/coff32.h
-coff32/coff32new.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32new.o: coff32/../libmach.h
-coff32/coff32new.o: coff32/coff32.h
-coff32/coff32probe.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32probe.o: coff32/../libmach.h
-coff32/coff32probe.o: coff32/coff32.h
-coff32/coff32read.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32read.o: coff32/../libmach.h
-coff32/coff32read.o: coff32/coff32.h
-coff32/coff32strip.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32strip.o: coff32/../libmach.h
-coff32/coff32strip.o: coff32/coff32.h
-coff32/coff32write.o: $(INCDIR)/scc/scc/mach.h
-coff32/coff32write.o: coff32/../libmach.h
-coff32/coff32write.o: coff32/coff32.h
-coffelf32.o: $(INCDIR)/scc/scc/mach.h
-coffelf32.o: libmach.h
-del.o: $(INCDIR)/scc/scc/mach.h
-del.o: libmach.h
-index.o: $(INCDIR)/scc/scc/mach.h
-index.o: libmach.h
-new.o: $(INCDIR)/scc/scc/mach.h
-new.o: libmach.h
-objdel.o: $(INCDIR)/scc/scc/mach.h
-objdel.o: libmach.h
-objfree.o: $(INCDIR)/scc/scc/mach.h
-objfree.o: libmach.h
-objlookup.o: $(INCDIR)/scc/scc/mach.h
-objnew.o: $(INCDIR)/scc/scc/mach.h
-objnew.o: libmach.h
-objpos.o: $(INCDIR)/scc/scc/mach.h
-objpos.o: libmach.h
-objread.o: $(INCDIR)/scc/scc/mach.h
-objread.o: libmach.h
-objreset.o: $(INCDIR)/scc/scc/mach.h
-objreset.o: libmach.h
-objsize.o: $(INCDIR)/scc/scc/mach.h
-objsize.o: libmach.h
-objstrip.o: $(INCDIR)/scc/scc/mach.h
-objstrip.o: libmach.h
-objtraverse.o: $(INCDIR)/scc/scc/mach.h
-objtraverse.o: libmach.h
-objtype.o: $(INCDIR)/scc/scc/mach.h
-objtype.o: libmach.h
-objwrite.o: $(INCDIR)/scc/scc/mach.h
-objwrite.o: libmach.h
-pack.o: $(INCDIR)/scc/scc/mach.h
-pack.o: libmach.h
-probe.o: $(INCDIR)/scc/scc/mach.h
-probe.o: libmach.h
-read.o: $(INCDIR)/scc/scc/mach.h
-read.o: libmach.h
-strip.o: $(INCDIR)/scc/scc/mach.h
-strip.o: libmach.h
-unpack.o: $(INCDIR)/scc/scc/mach.h
-unpack.o: libmach.h
-write.o: $(INCDIR)/scc/scc/mach.h
-write.o: libmach.h
+./addr2line.o: $(INCDIR)/scc/scc/mach.h
+./archive.o: $(INCDIR)/scc/scc/ar.h
+./archive.o: $(INCDIR)/scc/scc/mach.h
+./archive.o: .libmach.h
+./arindex.o: $(INCDIR)/scc/scc/mach.h
+./arindex.o: .libmach.h
+./armember.o: $(INCDIR)/scc/scc/ar.h
+./armember.o: $(INCDIR)/scc/scc/mach.h
+./artraverse.o: $(INCDIR)/scc/scc/ar.h
+./artraverse.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32del.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32del.o: ./coff32../libmach.h
+./coff32/coff32del.o: ./coff32coff32.h
+./coff32/coff32index.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32index.o: ./coff32../libmach.h
+./coff32/coff32index.o: ./coff32coff32.h
+./coff32/coff32new.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32new.o: ./coff32../libmach.h
+./coff32/coff32new.o: ./coff32coff32.h
+./coff32/coff32probe.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32probe.o: ./coff32../libmach.h
+./coff32/coff32probe.o: ./coff32coff32.h
+./coff32/coff32read.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32read.o: ./coff32../libmach.h
+./coff32/coff32read.o: ./coff32coff32.h
+./coff32/coff32strip.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32strip.o: ./coff32../libmach.h
+./coff32/coff32strip.o: ./coff32coff32.h
+./coff32/coff32write.o: $(INCDIR)/scc/scc/mach.h
+./coff32/coff32write.o: ./coff32../libmach.h
+./coff32/coff32write.o: ./coff32coff32.h
+./coffelf32.o: $(INCDIR)/scc/scc/mach.h
+./coffelf32.o: .libmach.h
+./del.o: $(INCDIR)/scc/scc/mach.h
+./del.o: .libmach.h
+./foridx.o: $(INCDIR)/scc/scc/mach.h
+./foridx.o: .libmach.h
+./forsect.o: $(INCDIR)/scc/scc/mach.h
+./forsect.o: .libmach.h
+./forsym.o: $(INCDIR)/scc/scc/mach.h
+./forsym.o: .libmach.h
+./index.o: $(INCDIR)/scc/scc/mach.h
+./index.o: .libmach.h
+./new.o: $(INCDIR)/scc/scc/mach.h
+./new.o: .libmach.h
+./objdel.o: $(INCDIR)/scc/scc/mach.h
+./objdel.o: .libmach.h
+./objfree.o: $(INCDIR)/scc/scc/mach.h
+./objfree.o: .libmach.h
+./objlookup.o: $(INCDIR)/scc/scc/mach.h
+./objnew.o: $(INCDIR)/scc/scc/mach.h
+./objnew.o: .libmach.h
+./objpos.o: $(INCDIR)/scc/scc/mach.h
+./objpos.o: .libmach.h
+./objread.o: $(INCDIR)/scc/scc/mach.h
+./objread.o: .libmach.h
+./objreset.o: $(INCDIR)/scc/scc/mach.h
+./objreset.o: .libmach.h
+./objstrip.o: $(INCDIR)/scc/scc/mach.h
+./objstrip.o: .libmach.h
+./objtype.o: $(INCDIR)/scc/scc/mach.h
+./objtype.o: .libmach.h
+./objwrite.o: $(INCDIR)/scc/scc/mach.h
+./objwrite.o: .libmach.h
+./pack.o: $(INCDIR)/scc/scc/mach.h
+./pack.o: .libmach.h
+./probe.o: $(INCDIR)/scc/scc/mach.h
+./probe.o: .libmach.h
+./read.o: $(INCDIR)/scc/scc/mach.h
+./read.o: .libmach.h
+./strip.o: $(INCDIR)/scc/scc/mach.h
+./strip.o: .libmach.h
+./unpack.o: $(INCDIR)/scc/scc/mach.h
+./unpack.o: .libmach.h
+./write.o: $(INCDIR)/scc/scc/mach.h
+./write.o: .libmach.h
--- a/src/libscc/deps.mk
+++ b/src/libscc/deps.mk
@@ -1,12 +1,11 @@
 #deps
-alloc.o: $(INCDIR)/scc/scc/scc.h
-bpack.o: $(INCDIR)/scc/scc/scc.h
-casecmp.o: $(INCDIR)/scc/scc/scc.h
-debug.o: $(INCDIR)/scc/scc/scc.h
-die.o: $(INCDIR)/scc/scc/scc.h
-lpack.o: $(INCDIR)/scc/scc/scc.h
-newitem.o: $(INCDIR)/scc/scc/scc.h
-xcalloc.o: $(INCDIR)/scc/scc/scc.h
-xmalloc.o: $(INCDIR)/scc/scc/scc.h
-xrealloc.o: $(INCDIR)/scc/scc/scc.h
-xstrdup.o: $(INCDIR)/scc/scc/scc.h
+./alloc.o: $(INCDIR)/scc/scc/scc.h
+./bpack.o: $(INCDIR)/scc/scc/scc.h
+./casecmp.o: $(INCDIR)/scc/scc/scc.h
+./debug.o: $(INCDIR)/scc/scc/scc.h
+./die.o: $(INCDIR)/scc/scc/scc.h
+./newitem.o: $(INCDIR)/scc/scc/scc.h
+./xcalloc.o: $(INCDIR)/scc/scc/scc.h
+./xmalloc.o: $(INCDIR)/scc/scc/scc.h
+./xrealloc.o: $(INCDIR)/scc/scc/scc.h
+./xstrdup.o: $(INCDIR)/scc/scc/scc.h