commit 4f44f1d0b852c81f027c933bf671cc8ddb66ecb9
parent a9ea247aa42e042523dec840ff85a7e5c6cf9db7
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Wed, 18 Sep 2019 06:59:34 +0200
[as] Move target makefiles to target directories
It keeps cleaner the directory structure.
Diffstat:
11 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/src/cmd/as/Makefile b/src/cmd/as/Makefile
@@ -29,10 +29,10 @@ dep: inc-dep
clean:
rm -f target/*/*.o target/*/*tbl.c
-include target/powerpc64.mk
-include target/powerpc.mk
-include target/amd64.mk
-include target/i386.mk
-include target/i286.mk
-include target/z80.mk
+include target/powerpc/powerpc64.mk
+include target/powerpc/powerpc.mk
+include target/x86/amd64.mk
+include target/x86/i386.mk
+include target/x86/i286.mk
+include target/x80/z80.mk
include deps.mk
diff --git a/src/cmd/as/target/amd64.mk b/src/cmd/as/target/amd64.mk
@@ -1,10 +0,0 @@
-AMD64_OBJ = $(OBJS) \
- target/x86/amd64tbl.o \
- target/x86/amd64.o \
- target/x86/ins.o \
-
-target/x86/amd64tbl.c: target/x86/x86.dat target/x86/rules.dat
- ./mktbl -f x86 -c amd64
-
-$(LIBEXEC)/as-amd64: $(AMD64_OBJ)
- $(CC) $(SCC_LDFLAGS) $(AMD64_OBJ) -lscc -o $@
diff --git a/src/cmd/as/target/i286.mk b/src/cmd/as/target/i286.mk
@@ -1,10 +0,0 @@
-I286_OBJ = $(OBJS) \
- target/x86/i286tbl.o \
- target/x86/i286.o \
- target/x86/ins.o \
-
-target/x86/i286tbl.c: target/x86/x86.dat target/x86/rules.dat
- ./mktbl -f x86 -c i286
-
-$(LIBEXEC)/as-i286: $(I286_OBJ)
- $(CC) $(SCC_LDFLAGS) $(I286_OBJ) -lscc -o $@
diff --git a/src/cmd/as/target/i386.mk b/src/cmd/as/target/i386.mk
@@ -1,10 +0,0 @@
-I386_OBJ = $(OBJS) \
- target/x86/i386tbl.o \
- target/x86/i386.o \
- target/x86/ins.o \
-
-target/x86/i386tbl.c: target/x86/x86.dat target/x86/rules.dat
- ./mktbl -f x86 -c i386
-
-$(LIBEXEC)/as-i386: $(I386_OBJ)
- $(CC) $(SCC_LDFLAGS) $(I386_OBJ) -lscc -o $@
diff --git a/src/cmd/as/target/powerpc.mk b/src/cmd/as/target/powerpc/powerpc.mk
diff --git a/src/cmd/as/target/powerpc64.mk b/src/cmd/as/target/powerpc/powerpc64.mk
diff --git a/src/cmd/as/target/x80/z80.mk b/src/cmd/as/target/x80/z80.mk
@@ -0,0 +1,11 @@
+Z80_OBJ =\
+ $(OBJS)\
+ target/x80/z80tbl.o\
+ target/x80/z80.o\
+ target/x80/ins.o\
+
+target/x80/z80tbl.c: target/x80/x80.dat target/x80/rules.dat
+ ./mktbl -f x80 -c z80
+
+$(LIBEXEC)/as-z80: $(OBJ) $(Z80_OBJ)
+ $(CC) $(SCC_LDFLAGS) $(Z80_OBJ) -lscc -o $@
diff --git a/src/cmd/as/target/x86/amd64.mk b/src/cmd/as/target/x86/amd64.mk
@@ -0,0 +1,11 @@
+AMD64_OBJ =\
+ $(OBJS)\
+ target/x86/amd64tbl.o\
+ target/x86/amd64.o\
+ target/x86/ins.o\
+
+target/x86/amd64tbl.c: target/x86/x86.dat target/x86/rules.dat
+ ./mktbl -f x86 -c amd64
+
+$(LIBEXEC)/as-amd64: $(AMD64_OBJ)
+ $(CC) $(SCC_LDFLAGS) $(AMD64_OBJ) -lscc -o $@
diff --git a/src/cmd/as/target/x86/i286.mk b/src/cmd/as/target/x86/i286.mk
@@ -0,0 +1,11 @@
+I286_OBJ =\
+ $(OBJS)\
+ target/x86/i286tbl.o\
+ target/x86/i286.o\
+ target/x86/ins.o\
+
+target/x86/i286tbl.c: target/x86/x86.dat target/x86/rules.dat
+ ./mktbl -f x86 -c i286
+
+$(LIBEXEC)/as-i286: $(I286_OBJ)
+ $(CC) $(SCC_LDFLAGS) $(I286_OBJ) -lscc -o $@
diff --git a/src/cmd/as/target/x86/i386.mk b/src/cmd/as/target/x86/i386.mk
@@ -0,0 +1,11 @@
+I386_OBJ =\
+ $(OBJS)\
+ target/x86/i386tbl.o\
+ target/x86/i386.o\
+ target/x86/ins.o\
+
+target/x86/i386tbl.c: target/x86/x86.dat target/x86/rules.dat
+ ./mktbl -f x86 -c i386
+
+$(LIBEXEC)/as-i386: $(I386_OBJ)
+ $(CC) $(SCC_LDFLAGS) $(I386_OBJ) -lscc -o $@
diff --git a/src/cmd/as/target/z80.mk b/src/cmd/as/target/z80.mk
@@ -1,10 +0,0 @@
-Z80_OBJ = $(OBJS) \
- target/x80/z80tbl.o \
- target/x80/z80.o \
- target/x80/ins.o \
-
-target/x80/z80tbl.c: target/x80/x80.dat target/x80/rules.dat
- ./mktbl -f x80 -c z80
-
-$(LIBEXEC)/as-z80: $(OBJ) $(Z80_OBJ)
- $(CC) $(SCC_LDFLAGS) $(Z80_OBJ) -lscc -o $@