[PATCH 6/7] newlib: libc: merge most sys/ configure scripts up a level

Mike Frysinger vapier@gentoo.org
Sun Jan 23 06:04:28 GMT 2022


The sys configure scripts are almost all effectively stub scripts that
pass the higher level options to its own makefile.  The phoenix & linux
ones are a bit more complicated with nested subdirs, so those have been
left alone for now.  Plus, I don't really have a way of testing them.
---
 newlib/libc/configure                   |  116 +-
 newlib/libc/configure.ac                |   52 +-
 newlib/libc/sys/a29khif/Makefile.am     |    3 -
 newlib/libc/sys/a29khif/Makefile.in     |  165 +-
 newlib/libc/sys/a29khif/aclocal.m4      | 1109 -----
 newlib/libc/sys/a29khif/configure       | 4942 -----------------------
 newlib/libc/sys/a29khif/configure.ac    |   13 -
 newlib/libc/sys/amdgcn/Makefile.am      |    3 -
 newlib/libc/sys/amdgcn/Makefile.in      |  139 +-
 newlib/libc/sys/amdgcn/aclocal.m4       | 1109 -----
 newlib/libc/sys/amdgcn/configure        | 4942 -----------------------
 newlib/libc/sys/amdgcn/configure.ac     |   13 -
 newlib/libc/sys/arm/Makefile.am         |    3 -
 newlib/libc/sys/arm/Makefile.in         |  165 +-
 newlib/libc/sys/arm/aclocal.m4          | 1109 -----
 newlib/libc/sys/arm/configure           | 4942 -----------------------
 newlib/libc/sys/arm/configure.ac        |   13 -
 newlib/libc/sys/d10v/Makefile.am        |    3 -
 newlib/libc/sys/d10v/Makefile.in        |  165 +-
 newlib/libc/sys/d10v/aclocal.m4         | 1109 -----
 newlib/libc/sys/d10v/configure          | 4942 -----------------------
 newlib/libc/sys/d10v/configure.ac       |   13 -
 newlib/libc/sys/decstation/Makefile.am  |    3 -
 newlib/libc/sys/decstation/Makefile.in  |  154 +-
 newlib/libc/sys/decstation/aclocal.m4   | 1109 -----
 newlib/libc/sys/decstation/configure    | 4942 -----------------------
 newlib/libc/sys/decstation/configure.ac |   13 -
 newlib/libc/sys/epiphany/Makefile.am    |    3 -
 newlib/libc/sys/epiphany/Makefile.in    |  139 +-
 newlib/libc/sys/epiphany/aclocal.m4     | 1109 -----
 newlib/libc/sys/epiphany/configure      | 4942 -----------------------
 newlib/libc/sys/epiphany/configure.ac   |   40 -
 newlib/libc/sys/h8300hms/Makefile.am    |    3 -
 newlib/libc/sys/h8300hms/Makefile.in    |  165 +-
 newlib/libc/sys/h8300hms/aclocal.m4     | 1109 -----
 newlib/libc/sys/h8300hms/configure      | 4942 -----------------------
 newlib/libc/sys/h8300hms/configure.ac   |   13 -
 newlib/libc/sys/h8500hms/Makefile.am    |    3 -
 newlib/libc/sys/h8500hms/Makefile.in    |  150 +-
 newlib/libc/sys/h8500hms/aclocal.m4     | 1109 -----
 newlib/libc/sys/h8500hms/configure      | 4942 -----------------------
 newlib/libc/sys/h8500hms/configure.ac   |   13 -
 newlib/libc/sys/m88kbug/Makefile.am     |    3 -
 newlib/libc/sys/m88kbug/Makefile.in     |  150 +-
 newlib/libc/sys/m88kbug/aclocal.m4      | 1109 -----
 newlib/libc/sys/m88kbug/configure       | 4942 -----------------------
 newlib/libc/sys/m88kbug/configure.ac    |   13 -
 newlib/libc/sys/mmixware/Makefile.am    |    3 -
 newlib/libc/sys/mmixware/Makefile.in    |  165 +-
 newlib/libc/sys/mmixware/aclocal.m4     | 1109 -----
 newlib/libc/sys/mmixware/configure      | 4942 -----------------------
 newlib/libc/sys/mmixware/configure.ac   |   13 -
 newlib/libc/sys/netware/Makefile.am     |    3 -
 newlib/libc/sys/netware/Makefile.in     |  154 +-
 newlib/libc/sys/netware/aclocal.m4      | 1109 -----
 newlib/libc/sys/netware/configure       | 4942 -----------------------
 newlib/libc/sys/netware/configure.ac    |   13 -
 newlib/libc/sys/or1k/Makefile.am        |    3 -
 newlib/libc/sys/or1k/Makefile.in        |  154 +-
 newlib/libc/sys/or1k/aclocal.m4         | 1109 -----
 newlib/libc/sys/or1k/configure          | 4942 -----------------------
 newlib/libc/sys/or1k/configure.ac       |   13 -
 newlib/libc/sys/rdos/Makefile.am        |    3 -
 newlib/libc/sys/rdos/Makefile.in        |  165 +-
 newlib/libc/sys/rdos/aclocal.m4         | 1109 -----
 newlib/libc/sys/rdos/configure          | 4942 -----------------------
 newlib/libc/sys/rdos/configure.ac       |   13 -
 newlib/libc/sys/rtems/Makefile.am       |    3 -
 newlib/libc/sys/rtems/Makefile.in       |  150 +-
 newlib/libc/sys/rtems/aclocal.m4        | 1109 -----
 newlib/libc/sys/rtems/configure         | 4942 -----------------------
 newlib/libc/sys/rtems/configure.ac      |   13 -
 newlib/libc/sys/sh/Makefile.am          |    3 -
 newlib/libc/sys/sh/Makefile.in          |  165 +-
 newlib/libc/sys/sh/aclocal.m4           | 1109 -----
 newlib/libc/sys/sh/configure            | 4942 -----------------------
 newlib/libc/sys/sh/configure.ac         |   13 -
 newlib/libc/sys/sparc64/Makefile.am     |    3 -
 newlib/libc/sys/sparc64/Makefile.in     |  161 +-
 newlib/libc/sys/sparc64/aclocal.m4      | 1109 -----
 newlib/libc/sys/sparc64/configure       | 4942 -----------------------
 newlib/libc/sys/sparc64/configure.ac    |   13 -
 newlib/libc/sys/sun4/Makefile.am        |    3 -
 newlib/libc/sys/sun4/Makefile.in        |  150 +-
 newlib/libc/sys/sun4/aclocal.m4         | 1109 -----
 newlib/libc/sys/sun4/configure          | 4942 -----------------------
 newlib/libc/sys/sun4/configure.ac       |   13 -
 newlib/libc/sys/sysmec/Makefile.am      |    3 -
 newlib/libc/sys/sysmec/Makefile.in      |  165 +-
 newlib/libc/sys/sysmec/aclocal.m4       | 1109 -----
 newlib/libc/sys/sysmec/configure        | 4942 -----------------------
 newlib/libc/sys/sysmec/configure.ac     |   13 -
 newlib/libc/sys/sysnec810/Makefile.am   |    3 -
 newlib/libc/sys/sysnec810/Makefile.in   |  165 +-
 newlib/libc/sys/sysnec810/aclocal.m4    | 1109 -----
 newlib/libc/sys/sysnec810/configure     | 4942 -----------------------
 newlib/libc/sys/sysnec810/configure.ac  |   13 -
 newlib/libc/sys/sysnecv850/Makefile.am  |    3 -
 newlib/libc/sys/sysnecv850/Makefile.in  |  165 +-
 newlib/libc/sys/sysnecv850/aclocal.m4   | 1109 -----
 newlib/libc/sys/sysnecv850/configure    | 4942 -----------------------
 newlib/libc/sys/sysnecv850/configure.ac |   13 -
 newlib/libc/sys/sysvi386/Makefile.am    |    3 -
 newlib/libc/sys/sysvi386/Makefile.in    |  165 +-
 newlib/libc/sys/sysvi386/aclocal.m4     | 1109 -----
 newlib/libc/sys/sysvi386/configure      | 4942 -----------------------
 newlib/libc/sys/sysvi386/configure.ac   |   13 -
 newlib/libc/sys/sysvnecv70/Makefile.am  |    3 -
 newlib/libc/sys/sysvnecv70/Makefile.in  |  165 +-
 newlib/libc/sys/sysvnecv70/aclocal.m4   | 1109 -----
 newlib/libc/sys/sysvnecv70/configure    | 4942 -----------------------
 newlib/libc/sys/sysvnecv70/configure.ac |   13 -
 newlib/libc/sys/tic80/Makefile.am       |    3 -
 newlib/libc/sys/tic80/Makefile.in       |  154 +-
 newlib/libc/sys/tic80/aclocal.m4        | 1109 -----
 newlib/libc/sys/tic80/configure         | 4942 -----------------------
 newlib/libc/sys/tic80/configure.ac      |   13 -
 newlib/libc/sys/tirtos/Makefile.am      |    3 -
 newlib/libc/sys/tirtos/Makefile.in      |  139 +-
 newlib/libc/sys/tirtos/aclocal.m4       | 1109 -----
 newlib/libc/sys/tirtos/configure        | 4942 -----------------------
 newlib/libc/sys/tirtos/configure.ac     |   13 -
 newlib/libc/sys/w65/Makefile.am         |    3 -
 newlib/libc/sys/w65/Makefile.in         |  150 +-
 newlib/libc/sys/w65/aclocal.m4          | 1109 -----
 newlib/libc/sys/w65/configure           | 4942 -----------------------
 newlib/libc/sys/w65/configure.ac        |   13 -
 newlib/libc/sys/z8ksim/Makefile.am      |    3 -
 newlib/libc/sys/z8ksim/Makefile.in      |  150 +-
 newlib/libc/sys/z8ksim/aclocal.m4       | 1109 -----
 newlib/libc/sys/z8ksim/configure        | 4942 -----------------------
 newlib/libc/sys/z8ksim/configure.ac     |   13 -
 132 files changed, 2726 insertions(+), 159285 deletions(-)
 delete mode 100644 newlib/libc/sys/a29khif/aclocal.m4
 delete mode 100755 newlib/libc/sys/a29khif/configure
 delete mode 100644 newlib/libc/sys/a29khif/configure.ac
 delete mode 100644 newlib/libc/sys/amdgcn/aclocal.m4
 delete mode 100755 newlib/libc/sys/amdgcn/configure
 delete mode 100644 newlib/libc/sys/amdgcn/configure.ac
 delete mode 100644 newlib/libc/sys/arm/aclocal.m4
 delete mode 100755 newlib/libc/sys/arm/configure
 delete mode 100644 newlib/libc/sys/arm/configure.ac
 delete mode 100644 newlib/libc/sys/d10v/aclocal.m4
 delete mode 100755 newlib/libc/sys/d10v/configure
 delete mode 100644 newlib/libc/sys/d10v/configure.ac
 delete mode 100644 newlib/libc/sys/decstation/aclocal.m4
 delete mode 100755 newlib/libc/sys/decstation/configure
 delete mode 100644 newlib/libc/sys/decstation/configure.ac
 delete mode 100644 newlib/libc/sys/epiphany/aclocal.m4
 delete mode 100755 newlib/libc/sys/epiphany/configure
 delete mode 100644 newlib/libc/sys/epiphany/configure.ac
 delete mode 100644 newlib/libc/sys/h8300hms/aclocal.m4
 delete mode 100755 newlib/libc/sys/h8300hms/configure
 delete mode 100644 newlib/libc/sys/h8300hms/configure.ac
 delete mode 100644 newlib/libc/sys/h8500hms/aclocal.m4
 delete mode 100755 newlib/libc/sys/h8500hms/configure
 delete mode 100644 newlib/libc/sys/h8500hms/configure.ac
 delete mode 100644 newlib/libc/sys/m88kbug/aclocal.m4
 delete mode 100755 newlib/libc/sys/m88kbug/configure
 delete mode 100644 newlib/libc/sys/m88kbug/configure.ac
 delete mode 100644 newlib/libc/sys/mmixware/aclocal.m4
 delete mode 100755 newlib/libc/sys/mmixware/configure
 delete mode 100644 newlib/libc/sys/mmixware/configure.ac
 delete mode 100644 newlib/libc/sys/netware/aclocal.m4
 delete mode 100755 newlib/libc/sys/netware/configure
 delete mode 100644 newlib/libc/sys/netware/configure.ac
 delete mode 100644 newlib/libc/sys/or1k/aclocal.m4
 delete mode 100755 newlib/libc/sys/or1k/configure
 delete mode 100644 newlib/libc/sys/or1k/configure.ac
 delete mode 100644 newlib/libc/sys/rdos/aclocal.m4
 delete mode 100755 newlib/libc/sys/rdos/configure
 delete mode 100644 newlib/libc/sys/rdos/configure.ac
 delete mode 100644 newlib/libc/sys/rtems/aclocal.m4
 delete mode 100755 newlib/libc/sys/rtems/configure
 delete mode 100644 newlib/libc/sys/rtems/configure.ac
 delete mode 100644 newlib/libc/sys/sh/aclocal.m4
 delete mode 100755 newlib/libc/sys/sh/configure
 delete mode 100644 newlib/libc/sys/sh/configure.ac
 delete mode 100644 newlib/libc/sys/sparc64/aclocal.m4
 delete mode 100755 newlib/libc/sys/sparc64/configure
 delete mode 100644 newlib/libc/sys/sparc64/configure.ac
 delete mode 100644 newlib/libc/sys/sun4/aclocal.m4
 delete mode 100755 newlib/libc/sys/sun4/configure
 delete mode 100644 newlib/libc/sys/sun4/configure.ac
 delete mode 100644 newlib/libc/sys/sysmec/aclocal.m4
 delete mode 100755 newlib/libc/sys/sysmec/configure
 delete mode 100644 newlib/libc/sys/sysmec/configure.ac
 delete mode 100644 newlib/libc/sys/sysnec810/aclocal.m4
 delete mode 100755 newlib/libc/sys/sysnec810/configure
 delete mode 100644 newlib/libc/sys/sysnec810/configure.ac
 delete mode 100644 newlib/libc/sys/sysnecv850/aclocal.m4
 delete mode 100755 newlib/libc/sys/sysnecv850/configure
 delete mode 100644 newlib/libc/sys/sysnecv850/configure.ac
 delete mode 100644 newlib/libc/sys/sysvi386/aclocal.m4
 delete mode 100755 newlib/libc/sys/sysvi386/configure
 delete mode 100644 newlib/libc/sys/sysvi386/configure.ac
 delete mode 100644 newlib/libc/sys/sysvnecv70/aclocal.m4
 delete mode 100755 newlib/libc/sys/sysvnecv70/configure
 delete mode 100644 newlib/libc/sys/sysvnecv70/configure.ac
 delete mode 100644 newlib/libc/sys/tic80/aclocal.m4
 delete mode 100755 newlib/libc/sys/tic80/configure
 delete mode 100644 newlib/libc/sys/tic80/configure.ac
 delete mode 100644 newlib/libc/sys/tirtos/aclocal.m4
 delete mode 100755 newlib/libc/sys/tirtos/configure
 delete mode 100644 newlib/libc/sys/tirtos/configure.ac
 delete mode 100644 newlib/libc/sys/w65/aclocal.m4
 delete mode 100755 newlib/libc/sys/w65/configure
 delete mode 100644 newlib/libc/sys/w65/configure.ac
 delete mode 100644 newlib/libc/sys/z8ksim/aclocal.m4
 delete mode 100755 newlib/libc/sys/z8ksim/configure
 delete mode 100644 newlib/libc/sys/z8ksim/configure.ac

diff --git a/newlib/libc/configure.ac b/newlib/libc/configure.ac
index 8ca783d84a85..436dd4070ec8 100644
--- a/newlib/libc/configure.ac
+++ b/newlib/libc/configure.ac
@@ -166,34 +166,34 @@ dnl do.  However, we do need to know whether they will produce a library.
 LIBC_SYS_LIB=
 if test -n "${sys_dir}"; then
   case ${sys_dir} in
-    a29khif) AC_CONFIG_SUBDIRS(sys/a29khif) ;;
-    amdgcn) AC_CONFIG_SUBDIRS(sys/amdgcn) ;;
-    arm) AC_CONFIG_SUBDIRS(sys/arm) ;;
-    d10v) AC_CONFIG_SUBDIRS(sys/d10v) ;;
-    decstation) AC_CONFIG_SUBDIRS(sys/decstation) ;;
-    epiphany) AC_CONFIG_SUBDIRS(sys/epiphany) ;;
-    h8300hms) AC_CONFIG_SUBDIRS(sys/h8300hms) ;;
-    h8500hms) AC_CONFIG_SUBDIRS(sys/h8500hms) ;;
+    a29khif) AC_CONFIG_FILES([sys/a29khif/Makefile]) ;;
+    amdgcn) AC_CONFIG_FILES([sys/amdgcn/Makefile]) ;;
+    arm) AC_CONFIG_FILES([sys/arm/Makefile]) ;;
+    d10v) AC_CONFIG_FILES([sys/d10v/Makefile]) ;;
+    decstation) AC_CONFIG_FILES([sys/decstation/Makefile]) ;;
+    epiphany) AC_CONFIG_FILES([sys/epiphany/Makefile]) ;;
+    h8300hms) AC_CONFIG_FILES([sys/h8300hms/Makefile]) ;;
+    h8500hms) AC_CONFIG_FILES([sys/h8500hms/Makefile]) ;;
     linux) AC_CONFIG_SUBDIRS(sys/linux) ;;
-    m88kbug) AC_CONFIG_SUBDIRS(sys/m88kbug) ;;
-    mmixware) AC_CONFIG_SUBDIRS(sys/mmixware) ;;
-    netware) AC_CONFIG_SUBDIRS(sys/netware) ;;
-    or1k) AC_CONFIG_SUBDIRS(sys/or1k) ;;
+    m88kbug) AC_CONFIG_FILES([sys/m88kbug/Makefile]) ;;
+    mmixware) AC_CONFIG_FILES([sys/mmixware/Makefile]) ;;
+    netware) AC_CONFIG_FILES([sys/netware/Makefile]) ;;
+    or1k) AC_CONFIG_FILES([sys/or1k/Makefile]) ;;
     phoenix) AC_CONFIG_SUBDIRS(sys/phoenix) ;;
-    rdos) AC_CONFIG_SUBDIRS(sys/rdos) ;;
-    rtems) AC_CONFIG_SUBDIRS(sys/rtems) ;;
-    sh) AC_CONFIG_SUBDIRS(sys/sh) ;;
-    sparc64) AC_CONFIG_SUBDIRS(sys/sparc64) ;;
-    sun4) AC_CONFIG_SUBDIRS(sys/sun4) ;;
-    sysmec) AC_CONFIG_SUBDIRS(sys/sysmec) ;;
-    sysnec810) AC_CONFIG_SUBDIRS(sys/sysnec810) ;;
-    sysnecv850) AC_CONFIG_SUBDIRS(sys/sysnecv850) ;;
-    sysvi386) AC_CONFIG_SUBDIRS(sys/sysvi386) ;;
-    sysvnecv70) AC_CONFIG_SUBDIRS(sys/sysvnecv70) ;;
-    tic80) AC_CONFIG_SUBDIRS(sys/tic80) ;;
-    tirtos) AC_CONFIG_SUBDIRS(sys/tirtos) ;;
-    w65) AC_CONFIG_SUBDIRS(sys/w65) ;;
-    z8ksim) AC_CONFIG_SUBDIRS(sys/z8ksim) ;;
+    rdos) AC_CONFIG_FILES([sys/rdos/Makefile]) ;;
+    rtems) AC_CONFIG_FILES([sys/rtems/Makefile]) ;;
+    sh) AC_CONFIG_FILES([sys/sh/Makefile]) ;;
+    sparc64) AC_CONFIG_FILES([sys/sparc64/Makefile]) ;;
+    sun4) AC_CONFIG_FILES([sys/sun4/Makefile]) ;;
+    sysmec) AC_CONFIG_FILES([sys/sysmec/Makefile]) ;;
+    sysnec810) AC_CONFIG_FILES([sys/sysnec810/Makefile]) ;;
+    sysnecv850) AC_CONFIG_FILES([sys/sysnecv850/Makefile]) ;;
+    sysvi386) AC_CONFIG_FILES([sys/sysvi386/Makefile]) ;;
+    sysvnecv70) AC_CONFIG_FILES([sys/sysvnecv70/Makefile]) ;;
+    tic80) AC_CONFIG_FILES([sys/tic80/Makefile]) ;;
+    tirtos) AC_CONFIG_FILES([sys/tirtos/Makefile]) ;;
+    w65) AC_CONFIG_FILES([sys/w65/Makefile]) ;;
+    z8ksim) AC_CONFIG_FILES([sys/z8ksim/Makefile]) ;;
     *) AC_MSG_ERROR([unsupported sys_dir "${sys_dir}"]) ;;
   esac
 
diff --git a/newlib/libc/sys/a29khif/Makefile.am b/newlib/libc/sys/a29khif/Makefile.am
index 6e973bc92732..f2e8644f8726 100644
--- a/newlib/libc/sys/a29khif/Makefile.am
+++ b/newlib/libc/sys/a29khif/Makefile.am
@@ -45,6 +45,3 @@ lib_a_SOURCES = \
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/amdgcn/Makefile.am b/newlib/libc/sys/amdgcn/Makefile.am
index ad2eaa710385..87f63301a5c4 100644
--- a/newlib/libc/sys/amdgcn/Makefile.am
+++ b/newlib/libc/sys/amdgcn/Makefile.am
@@ -9,6 +9,3 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = close.c fstat.c isatty.c lseek.c read.c write.c \
                 fcntl.c getpid.c kill.c open.c raise.c stat.c unlink.c
 lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index 9aa9eafc22a3..b88c30c5a5ee 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -21,6 +21,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
 if MAY_SUPPLY_SYSCALLS
 all-local: crt0.o
 endif
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/d10v/Makefile.am b/newlib/libc/sys/d10v/Makefile.am
index 5a6d300ea259..50866743a048 100644
--- a/newlib/libc/sys/d10v/Makefile.am
+++ b/newlib/libc/sys/d10v/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.S creat.c
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/decstation/Makefile.am b/newlib/libc/sys/decstation/Makefile.am
index 0cb245e8e412..22a2fa7d7008 100644
--- a/newlib/libc/sys/decstation/Makefile.am
+++ b/newlib/libc/sys/decstation/Makefile.am
@@ -40,6 +40,3 @@ all-local: crt0.o
 
 crt0.o:
 	cp /lib/crt0.o crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/epiphany/Makefile.am b/newlib/libc/sys/epiphany/Makefile.am
index 0b6ee6e8c620..5448105206db 100644
--- a/newlib/libc/sys/epiphany/Makefile.am
+++ b/newlib/libc/sys/epiphany/Makefile.am
@@ -35,6 +35,3 @@ noinst_LIBRARIES = lib.a
 # crt0.o comes from libgloss
 lib_a_SOURCES = e_printf.c
 lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
index 3e87cf66c2c3..634c9071eb5b 100644
--- a/newlib/libc/sys/h8300hms/Makefile.am
+++ b/newlib/libc/sys/h8300hms/Makefile.am
@@ -11,6 +11,3 @@ lib_a_SOURCES = syscalls.c _exit.S sbrk.c misc.c crt1.c \
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/h8500hms/Makefile.am b/newlib/libc/sys/h8500hms/Makefile.am
index 7ebe8544a348..57abb9f29199 100644
--- a/newlib/libc/sys/h8500hms/Makefile.am
+++ b/newlib/libc/sys/h8500hms/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c misc.c
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/m88kbug/Makefile.am b/newlib/libc/sys/m88kbug/Makefile.am
index e94eaabd62af..60967d846dbf 100644
--- a/newlib/libc/sys/m88kbug/Makefile.am
+++ b/newlib/libc/sys/m88kbug/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
index 0d43c1dc8fe9..24b0eccf39e5 100644
--- a/newlib/libc/sys/mmixware/Makefile.am
+++ b/newlib/libc/sys/mmixware/Makefile.am
@@ -14,6 +14,3 @@ lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c \
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/netware/Makefile.am b/newlib/libc/sys/netware/Makefile.am
index 79b13a2efbe8..d2f1fec50dfa 100644
--- a/newlib/libc/sys/netware/Makefile.am
+++ b/newlib/libc/sys/netware/Makefile.am
@@ -11,6 +11,3 @@ lib_a_SOURCES = \
 	link.c
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/or1k/Makefile.am b/newlib/libc/sys/or1k/Makefile.am
index 3e149461c426..88f2c1eccbd1 100644
--- a/newlib/libc/sys/or1k/Makefile.am
+++ b/newlib/libc/sys/or1k/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
 
 lib_a_SOURCES = getreent.S mlock.c
 lib_a_CFLAGS=$(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
index 05c093d1ff19..0bc1d26fd1ee 100644
--- a/newlib/libc/sys/rdos/Makefile.am
+++ b/newlib/libc/sys/rdos/Makefile.am
@@ -13,6 +13,3 @@ lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/rtems/Makefile.am b/newlib/libc/sys/rtems/Makefile.am
index 215de8ac0896..d1604295676f 100644
--- a/newlib/libc/sys/rtems/Makefile.am
+++ b/newlib/libc/sys/rtems/Makefile.am
@@ -11,9 +11,6 @@ lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
 
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/arpa; \
 	for i in $(srcdir)/include/arpa/*.h; do \
diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
index 21cacb426e57..6dc19fe43dfa 100644
--- a/newlib/libc/sys/sh/Makefile.am
+++ b/newlib/libc/sys/sh/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.S creat.c ftruncate.c truncate.c
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sparc64/Makefile.am b/newlib/libc/sys/sparc64/Makefile.am
index ef9c64577099..f2437ba6680c 100644
--- a/newlib/libc/sys/sparc64/Makefile.am
+++ b/newlib/libc/sys/sparc64/Makefile.am
@@ -114,6 +114,3 @@ unlink_r.o: unlink.S
 wait_r.o: wait.S
 wait4_r.o: wait4.S
 write_r.o: write.S
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sun4/Makefile.am b/newlib/libc/sys/sun4/Makefile.am
index 1d4fe967b6ae..13f4745b09ff 100644
--- a/newlib/libc/sys/sun4/Makefile.am
+++ b/newlib/libc/sys/sun4/Makefile.am
@@ -91,6 +91,3 @@ all-local: crt0.o
 
 crt0.o:
 	cp /lib/crt0.o crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysmec/Makefile.am b/newlib/libc/sys/sysmec/Makefile.am
index c6902a9ca832..815ebcd689b2 100644
--- a/newlib/libc/sys/sysmec/Makefile.am
+++ b/newlib/libc/sys/sysmec/Makefile.am
@@ -14,6 +14,3 @@ lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysnec810/Makefile.am b/newlib/libc/sys/sysnec810/Makefile.am
index baf7d848355d..d62fd8b3a72c 100644
--- a/newlib/libc/sys/sysnec810/Makefile.am
+++ b/newlib/libc/sys/sysnec810/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = io.S write.c sbrk.c misc.c
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysnecv850/Makefile.am b/newlib/libc/sys/sysnecv850/Makefile.am
index 06ac517b87f8..bd8474fcbfd6 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.am
+++ b/newlib/libc/sys/sysnecv850/Makefile.am
@@ -33,6 +33,3 @@ lib_a_CFLAGS = $(AM_CFLAGS)
 if MAY_SUPPLY_SYSCALLS
 all-local: crt0.o
 endif
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysvi386/Makefile.am b/newlib/libc/sys/sysvi386/Makefile.am
index 15284ca42297..03bc72d2f011 100644
--- a/newlib/libc/sys/sysvi386/Makefile.am
+++ b/newlib/libc/sys/sysvi386/Makefile.am
@@ -19,6 +19,3 @@ lib_a_SOURCES = \
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.am b/newlib/libc/sys/sysvnecv70/Makefile.am
index f27364087271..e5618f961707 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.am
+++ b/newlib/libc/sys/sysvnecv70/Makefile.am
@@ -11,6 +11,3 @@ lib_a_SOURCES = ioctl.S isatty.S read.S lseek.S close.S sbrk.S fstat.S \
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/tic80/Makefile.am b/newlib/libc/sys/tic80/Makefile.am
index 2027dda7aea7..0f3a5555bfa1 100644
--- a/newlib/libc/sys/tic80/Makefile.am
+++ b/newlib/libc/sys/tic80/Makefile.am
@@ -15,6 +15,3 @@ EXTRA_LIBRARIES = libfoo.a
 libfoo_a_SOURCES = crt0.c
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/tirtos/Makefile.am b/newlib/libc/sys/tirtos/Makefile.am
index c8a2d42eeeb7..c9f73119b025 100644
--- a/newlib/libc/sys/tirtos/Makefile.am
+++ b/newlib/libc/sys/tirtos/Makefile.am
@@ -8,6 +8,3 @@ noinst_LIBRARIES = lib.a
 
 lib_a_SOURCES = lock.c 
 lib_a_CFLAGS = $(AM_CFLAGS)
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/w65/Makefile.am b/newlib/libc/sys/w65/Makefile.am
index adba49696f2e..e58f2ecd5701 100644
--- a/newlib/libc/sys/w65/Makefile.am
+++ b/newlib/libc/sys/w65/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = syscalls.c trap.c
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/z8ksim/Makefile.am b/newlib/libc/sys/z8ksim/Makefile.am
index 6f90a0c09280..0c6706ff60ef 100644
--- a/newlib/libc/sys/z8ksim/Makefile.am
+++ b/newlib/libc/sys/z8ksim/Makefile.am
@@ -10,6 +10,3 @@ lib_a_SOURCES = glue.c
 lib_a_CFLAGS = $(AM_CFLAGS)
 
 all-local: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../.. -I ../../../.. -I ../../../../config
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-- 
2.34.1



More information about the Newlib mailing list