[PATCH 1/5] newlib: phoenix: move some logic from configure to the Makefile

[Mike Frysinger]

These configure scripts hardcode some settings, so move them to the
Makefile to simplify so we can drop the configure scripts entirely.
---
 newlib/libc/sys/phoenix/Makefile.am          | 2 ++
 newlib/libc/sys/phoenix/Makefile.in          | 2 +-
 newlib/libc/sys/phoenix/configure            | 4 ----
 newlib/libc/sys/phoenix/configure.ac         | 3 ---
 newlib/libc/sys/phoenix/machine/Makefile.am  | 2 ++
 newlib/libc/sys/phoenix/machine/Makefile.in  | 2 +-
 newlib/libc/sys/phoenix/machine/configure    | 7 -------
 newlib/libc/sys/phoenix/machine/configure.ac | 6 ------
 8 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index 49647c207544..d6c32e734e5b 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLA
 
 SUBDIRS = machine
 
+PHOENIX_MACH_LIB = machine/lib.a
+
 SUBLIBS = \
 	$(PHOENIX_MACH_LIB)
 
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
index 55793f7a98c0..9d64b9d258a2 100644
--- a/newlib/libc/sys/phoenix/configure.ac
+++ b/newlib/libc/sys/phoenix/configure.ac
@@ -11,8 +11,5 @@ NEWLIB_CONFIGURE(../../..)
 
 AC_CONFIG_SUBDIRS(machine)
 
-PHOENIX_MACH_LIB=machine/lib.a
-AC_SUBST(PHOENIX_MACH_LIB)
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/newlib/libc/sys/phoenix/machine/Makefile.am b/newlib/libc/sys/phoenix/machine/Makefile.am
index 06c2509a2aab..793d011bef30 100644
--- a/newlib/libc/sys/phoenix/machine/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/Makefile.am
@@ -2,6 +2,8 @@
 
 SUBDIRS = $(machine_dir) .
 
+CRT0 = crt0.o
+
 noinst_DATA = $(CRT0) lib.a
 
 $(CRT0): $(machine_dir)/$(CRT0)
diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys/phoenix/machine/configure.ac
index f3f7c79bc1f5..05dd0f8e48b6 100644
--- a/newlib/libc/sys/phoenix/machine/configure.ac
+++ b/newlib/libc/sys/phoenix/machine/configure.ac
@@ -18,12 +18,6 @@ if test -n "${machine_dir}"; then
   esac;
 fi
 
-CRT0=
-if test -n "${machine_dir}"; then
-  CRT0=crt0.o
-fi
-AC_SUBST(CRT0)
-
 AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
 
 AC_CONFIG_FILES([Makefile])
-- 
2.34.1