Merge remote-tracking branch 'upstream/master'HEADmaster

15 files changed, 3 insertions, 24 deletions

diff --git a/unix/make/Make.Darwin-386 b/unix/make/Make.Darwin
index 21ede6f2..21ede6f2 100644
--- a/unix/make/Make.Darwin-386
+++ b/unix/make/Make.Darwin
diff --git a/unix/make/Make.Darwin-PowerMacintosh b/unix/make/Make.Darwin-PowerMacintosh
deleted file mode 100644
index 21ede6f2..00000000
--- a/unix/make/Make.Darwin-PowerMacintosh
+++ /dev/null
@@ -1,7 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I. -I${PREFIX}/include
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O
-RANLIB=ranlib
diff --git a/unix/make/Make.FreeBSD-386 b/unix/make/Make.FreeBSD
index 87aa579f..87aa579f 100644
--- a/unix/make/Make.FreeBSD-386
+++ b/unix/make/Make.FreeBSD
diff --git a/unix/make/Make.HP-UX-9000 b/unix/make/Make.HP-UX
index edbdc111..edbdc111 100644
--- a/unix/make/Make.HP-UX-9000
+++ b/unix/make/Make.HP-UX
diff --git a/unix/make/Make.Linux-x86_64 b/unix/make/Make.Linux
index 1fadb5f8..1fadb5f8 100644
--- a/unix/make/Make.Linux-x86_64
+++ b/unix/make/Make.Linux
diff --git a/unix/make/Make.Linux-386 b/unix/make/Make.Linux-386
deleted file mode 100644
index c1dc4109..00000000
--- a/unix/make/Make.Linux-386
+++ /dev/null
@@ -1,6 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I.
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O
diff --git a/unix/make/Make.Linux-power b/unix/make/Make.Linux-power
deleted file mode 100644
index c1dc4109..00000000
--- a/unix/make/Make.Linux-power
+++ /dev/null
@@ -1,6 +0,0 @@
-CC=gcc
-CFLAGS+=-Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -O2 -g -c -I.
-O=o
-AR=ar
-ARFLAGS=rvc
-NAN=nan64.$O
diff --git a/unix/make/Make.NetBSD-386 b/unix/make/Make.NetBSD
index 87aa579f..87aa579f 100644
--- a/unix/make/Make.NetBSD-386
+++ b/unix/make/Make.NetBSD
diff --git a/unix/make/Make.OSF1-alpha b/unix/make/Make.OSF1
index 3d45279b..3d45279b 100644
--- a/unix/make/Make.OSF1-alpha
+++ b/unix/make/Make.OSF1
diff --git a/unix/make/Make.OpenBSD-386 b/unix/make/Make.OpenBSD
index 87aa579f..87aa579f 100644
--- a/unix/make/Make.OpenBSD-386
+++ b/unix/make/Make.OpenBSD
diff --git a/unix/make/Make.SunOS b/unix/make/Make.SunOS
new file mode 100644
index 00000000..a306597b
--- /dev/null
+++ b/unix/make/Make.SunOS
@@ -0,0 +1,2 @@
+include Make.SunOS-$(CC)
+NAN=nan64.$O
diff --git a/unix/make/Make.SunOS-sun4u-cc b/unix/make/Make.SunOS-cc
index 829301de..829301de 100644
--- a/unix/make/Make.SunOS-sun4u-cc
+++ b/unix/make/Make.SunOS-cc
diff --git a/unix/make/Make.SunOS-sun4u-gcc b/unix/make/Make.SunOS-gcc
index 5c415948..5c415948 100644
--- a/unix/make/Make.SunOS-sun4u-gcc
+++ b/unix/make/Make.SunOS-gcc
diff --git a/unix/make/Make.SunOS-sun4u b/unix/make/Make.SunOS-sun4u
deleted file mode 100644
index c5fe67b8..00000000
--- a/unix/make/Make.SunOS-sun4u
+++ /dev/null
@@ -1,2 +0,0 @@
-include Make.SunOS-sun4u-$(CC)
-NAN=nan64.$O
diff --git a/unix/make/Makefile.TOP b/unix/make/Makefile.TOP
index 516937e0..5feb1d47 100644
--- a/unix/make/Makefile.TOP
+++ b/unix/make/Makefile.TOP
@@ -1,18 +1,16 @@
 
 # this works in gnu make
 SYSNAME:=${shell uname}
-OBJTYPE:=${shell uname -m | sed 's;i.86;386;; s;/.*;;; s; ;;g'}
 
 # this works in bsd make
 SYSNAME!=uname
-OBJTYPE!=uname -m | sed 's;i.86;386;; s;amd64;x864_64;; s;/.*;;; s; ;;g'
 
 # the gnu rules will mess up bsd but not vice versa,
 # hence the gnu rules come first.
 
 RANLIB=true
 
-include Make.$(SYSNAME)-$(OBJTYPE)
+include Make.$(SYSNAME)
 
 PREFIX=/usr/local