From 9c558eed45d42d3660abed5f416328269294d078 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Tue, 10 May 2016 23:45:13 -0400
Subject: build system: upgrade build system, eliminate differences in core
 definitions.

Prior to this patch, there were several differences between this project's
build system and the one from which it was derived (sofort). Although the
differences were very minor and for the most part related to this project
being part of a free-standing, midipix-specific development framework,
they still added an extra maintenance burden, specifically by requiring
that common changes be applied via patch(1) rather than git-am(1).

Following recent improvements to the common build system, it is now
possible to have a free-standing, midipix-specific project without
any changes to the core build system files, hence the current upgrade.
---
 sysinfo/host/host.sh                 | 1 -
 sysinfo/host/i686-nt32-midipix.mk    | 4 ++--
 sysinfo/host/i686-unknown-linux.mk   | 5 -----
 sysinfo/host/i686-w64-mingw32.mk     | 4 ++--
 sysinfo/host/native.mk               | 4 ++--
 sysinfo/host/x86_64-nt64-midipix.mk  | 4 ++--
 sysinfo/host/x86_64-unknown-linux.mk | 5 -----
 sysinfo/host/x86_64-w64-mingw32.mk   | 4 ++--
 8 files changed, 10 insertions(+), 21 deletions(-)
 delete mode 100644 sysinfo/host/i686-unknown-linux.mk
 delete mode 100644 sysinfo/host/x86_64-unknown-linux.mk

(limited to 'sysinfo/host')

diff --git a/sysinfo/host/host.sh b/sysinfo/host/host.sh
index 9caa07b..b3975ae 100755
--- a/sysinfo/host/host.sh
+++ b/sysinfo/host/host.sh
@@ -21,7 +21,6 @@ host_test()
 	exit 2
 }
 
-
 # one: args
 for arg ; do
 	case "$arg" in
diff --git a/sysinfo/host/i686-nt32-midipix.mk b/sysinfo/host/i686-nt32-midipix.mk
index df3185b..fd4b8f8 100644
--- a/sysinfo/host/i686-nt32-midipix.mk
+++ b/sysinfo/host/i686-nt32-midipix.mk
@@ -1,5 +1,5 @@
 include $(PROJECT_DIR)/sysinfo/os/midipix.mk
 
-ARCH 		= nt32
-HOST_BITS 	= 32
+ARCH		= nt32
+HOST_BITS	= 32
 HOST_UNDERSCORE = '_'
diff --git a/sysinfo/host/i686-unknown-linux.mk b/sysinfo/host/i686-unknown-linux.mk
deleted file mode 100644
index 79d497b..0000000
--- a/sysinfo/host/i686-unknown-linux.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(PROJECT_DIR)/sysinfo/os/linux.mk
-
-ARCH 		= i386
-HOST_BITS 	= 32
-HOST_UNDERSCORE = '_'
diff --git a/sysinfo/host/i686-w64-mingw32.mk b/sysinfo/host/i686-w64-mingw32.mk
index b8ba461..b18e2e3 100644
--- a/sysinfo/host/i686-w64-mingw32.mk
+++ b/sysinfo/host/i686-w64-mingw32.mk
@@ -1,5 +1,5 @@
 include $(PROJECT_DIR)/sysinfo/os/mingw.mk
 
-ARCH 		= w32
-HOST_BITS 	= 32
+ARCH		= w32
+HOST_BITS	= 32
 HOST_UNDERSCORE = '_'
diff --git a/sysinfo/host/native.mk b/sysinfo/host/native.mk
index 08b02b6..f0cf720 100644
--- a/sysinfo/host/native.mk
+++ b/sysinfo/host/native.mk
@@ -1,7 +1,7 @@
 include $(PROJECT_DIR)/sysinfo/os/$(NATIVE_OS).mk
 
-OS 		= $(NATIVE_OS)
-HOST_BITS 	= $(NATIVE_OS_BITS)
+OS		= $(NATIVE_OS)
+HOST_BITS	= $(NATIVE_OS_BITS)
 HOST_UNDERSCORE = $(NATIVE_OS_UNDERSCORE)
 
 ifeq ($(OS),linux)
diff --git a/sysinfo/host/x86_64-nt64-midipix.mk b/sysinfo/host/x86_64-nt64-midipix.mk
index fef6345..d0e1d52 100644
--- a/sysinfo/host/x86_64-nt64-midipix.mk
+++ b/sysinfo/host/x86_64-nt64-midipix.mk
@@ -1,5 +1,5 @@
 include $(PROJECT_DIR)/sysinfo/os/midipix.mk
 
-ARCH 		= nt64
-HOST_BITS 	= 64
+ARCH		= nt64
+HOST_BITS	= 64
 HOST_UNDERSCORE = ''
diff --git a/sysinfo/host/x86_64-unknown-linux.mk b/sysinfo/host/x86_64-unknown-linux.mk
deleted file mode 100644
index 76afb56..0000000
--- a/sysinfo/host/x86_64-unknown-linux.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(PROJECT_DIR)/sysinfo/os/linux.mk
-
-ARCH 		= x86_64
-HOST_BITS 	= 64
-HOST_UNDERSCORE = ''
diff --git a/sysinfo/host/x86_64-w64-mingw32.mk b/sysinfo/host/x86_64-w64-mingw32.mk
index 7cded15..a86f9b0 100644
--- a/sysinfo/host/x86_64-w64-mingw32.mk
+++ b/sysinfo/host/x86_64-w64-mingw32.mk
@@ -1,5 +1,5 @@
 include $(PROJECT_DIR)/sysinfo/os/mingw.mk
 
-ARCH 		= w64
-HOST_BITS 	= 64
+ARCH		= w64
+HOST_BITS	= 64
 HOST_UNDERSCORE = ''
-- 
cgit v1.2.3