From c4d7e5868b2173750abf8d49f07bba7035cf10a3 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 13 Feb 2015 14:51:13 +0000 Subject: [PATCH] Makefiles: rework Will's changes in order to make overrides work again We now use target.mk (mandatory) for per platform initial settings and we use rules.mk (optional) in the platform directory after the CPU rules are processed in order to override them --- Kernel/platform-8086test/target.mk | 1 + Kernel/platform-atarist/target.mk | 1 + Kernel/platform-dragon/target.mk | 1 + Kernel/platform-micropack/target.mk | 1 + Kernel/platform-msx1/target.mk | 1 + Kernel/platform-msx2/target.mk | 1 + Kernel/platform-n8vem-mark4/target.mk | 1 + Kernel/platform-nc100/target.mk | 1 + Kernel/platform-p112/target.mk | 1 + Kernel/platform-socz80/target.mk | 1 + Kernel/platform-tgl6502/target.mk | 1 + Kernel/platform-trs80/target.mk | 1 + Kernel/platform-ubee/target.mk | 1 + Kernel/platform-z80pack-lite/target.mk | 1 + Kernel/platform-z80pack/target.mk | 1 + Kernel/platform-zx128/target.mk | 1 + 16 files changed, 16 insertions(+) create mode 100644 Kernel/platform-8086test/target.mk create mode 100644 Kernel/platform-atarist/target.mk create mode 100644 Kernel/platform-dragon/target.mk create mode 100644 Kernel/platform-micropack/target.mk create mode 100644 Kernel/platform-msx1/target.mk create mode 100644 Kernel/platform-msx2/target.mk create mode 100644 Kernel/platform-n8vem-mark4/target.mk create mode 100644 Kernel/platform-nc100/target.mk create mode 100644 Kernel/platform-p112/target.mk create mode 100644 Kernel/platform-socz80/target.mk create mode 100644 Kernel/platform-tgl6502/target.mk create mode 100644 Kernel/platform-trs80/target.mk create mode 100644 Kernel/platform-ubee/target.mk create mode 100644 Kernel/platform-z80pack-lite/target.mk create mode 100644 Kernel/platform-z80pack/target.mk create mode 100644 Kernel/platform-zx128/target.mk diff --git a/Kernel/platform-8086test/target.mk b/Kernel/platform-8086test/target.mk new file mode 100644 index 00000000..6361df69 --- /dev/null +++ b/Kernel/platform-8086test/target.mk @@ -0,0 +1 @@ +export CPU = 8086 diff --git a/Kernel/platform-atarist/target.mk b/Kernel/platform-atarist/target.mk new file mode 100644 index 00000000..df1c235f --- /dev/null +++ b/Kernel/platform-atarist/target.mk @@ -0,0 +1 @@ +export CPU = 68000 diff --git a/Kernel/platform-dragon/target.mk b/Kernel/platform-dragon/target.mk new file mode 100644 index 00000000..e9abbba1 --- /dev/null +++ b/Kernel/platform-dragon/target.mk @@ -0,0 +1 @@ +export CPU = 6809 diff --git a/Kernel/platform-micropack/target.mk b/Kernel/platform-micropack/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-micropack/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-msx1/target.mk b/Kernel/platform-msx1/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-msx1/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-msx2/target.mk b/Kernel/platform-msx2/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-msx2/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-n8vem-mark4/target.mk b/Kernel/platform-n8vem-mark4/target.mk new file mode 100644 index 00000000..55976672 --- /dev/null +++ b/Kernel/platform-n8vem-mark4/target.mk @@ -0,0 +1 @@ +export CPU = z180 diff --git a/Kernel/platform-nc100/target.mk b/Kernel/platform-nc100/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-nc100/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-p112/target.mk b/Kernel/platform-p112/target.mk new file mode 100644 index 00000000..55976672 --- /dev/null +++ b/Kernel/platform-p112/target.mk @@ -0,0 +1 @@ +export CPU = z180 diff --git a/Kernel/platform-socz80/target.mk b/Kernel/platform-socz80/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-socz80/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-tgl6502/target.mk b/Kernel/platform-tgl6502/target.mk new file mode 100644 index 00000000..eb53ebcf --- /dev/null +++ b/Kernel/platform-tgl6502/target.mk @@ -0,0 +1 @@ +export CPU = 6502 diff --git a/Kernel/platform-trs80/target.mk b/Kernel/platform-trs80/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-trs80/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-ubee/target.mk b/Kernel/platform-ubee/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-ubee/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-z80pack-lite/target.mk b/Kernel/platform-z80pack-lite/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-z80pack-lite/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-z80pack/target.mk b/Kernel/platform-z80pack/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-z80pack/target.mk @@ -0,0 +1 @@ +export CPU = z80 diff --git a/Kernel/platform-zx128/target.mk b/Kernel/platform-zx128/target.mk new file mode 100644 index 00000000..3bffcde0 --- /dev/null +++ b/Kernel/platform-zx128/target.mk @@ -0,0 +1 @@ +export CPU = z80 -- 2.34.1