2 files changed, 66 insertions, 28 deletions
diff --git a/extra/scripts/create_links.sh b/extra/scripts/create_links.sh
deleted file mode 100755
index 606890c5d..000000000
--- a/extra/scripts/create_links.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-# Creates the necessary links to build w/ the Makefile.in files
-
-DIRS="ldso libc libcrypt libintl libm libnsl libpthread libresolv librt libutil"
-DIRS2="ldso/ldso ldso/libdl libpthread/linuxthreads libpthread/linuxthreads_db"
-
-for x in ${DIRS} ; do
-	find ${x} -type f -name Makefile -exec rm -f {} \;
-	ln -sf ../extra/scripts/Makefile.libs.lvl1 ${x}/Makefile
-done
-
-for x in ${DIRS2} ; do
-	ln -sf ../../extra/scripts/Makefile.libs.lvl2 ${x}/Makefile
-done
-
-ln -sf ../../../extra/scripts/Makefile.objs.lvl3 libc/sysdeps/linux/Makefile
-ln -sf ../../extra/scripts/Makefile.objs.lvl2 libc/string/Makefile
-
-rm -f Makefile
-ln -sf Makefile.in Makefile
-
-exit 0
diff --git a/extra/scripts/create_makefiles.sh b/extra/scripts/create_makefiles.sh
new file mode 100755
index 000000000..ee03ec587
--- /dev/null
+++ b/extra/scripts/create_makefiles.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+#
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+#
+
+# Creates the necessary Makefiles to build w/ the Makefile.{arch,in} files
+
+DIRS="ldso libc libcrypt libintl libm libnsl libpthread libresolv librt libutil"
+
+if [ ! -f Makerules ] ; then
+	echo "Run this command in top_srcdir"
+	exit 1
+fi
+
+if [ -z "${USE_CMD}" ] ; then
+USE_CMD="cp"
+fi
+
+RM="rm -f"
+${RM} Makefile
+${USE_CMD} Makefile.in Makefile
+
+#for x in ${DIRS} ; do
+#	find ./${x} -name Makefile -exec rm -f {} \;
+#done
+
+for x in */Makefile.in ; do
+	${RM} $(dirname ${x})/Makefile
+	${USE_CMD} extra/scripts/Makefile.libs.lvl1 $(dirname ${x})/Makefile
+done
+
+for x in */*/Makefile.in ; do
+	${RM} $(dirname ${x})/Makefile
+	${USE_CMD} extra/scripts/Makefile.objs.lvl2 $(dirname ${x})/Makefile
+done
+
+# overwrites the earlier ones, we do not add arch specific to libm/arch
+for x in ldso/*/Makefile.in libpthread/*/Makefile.in ; do
+	${RM} $(dirname ${x})/Makefile
+	${USE_CMD} extra/scripts/Makefile.libs.lvl2 $(dirname ${x})/Makefile
+done
+
+for x in */*/*/Makefile.in ; do
+	${RM} $(dirname ${x})/Makefile
+	${USE_CMD} extra/scripts/Makefile.objs.lvl3 $(dirname ${x})/Makefile
+done
+
+for x in libc/*/*/Makefile.arch ; do
+	${RM} $(dirname ${x})/Makefile
+	${USE_CMD} extra/scripts/Makefile.arch.lvl3 $(dirname ${x})/Makefile
+done
+
+for x in */*/*/*/Makefile.in ; do
+	${RM} $(dirname ${x})/Makefile
+	${USE_CMD} extra/scripts/Makefile.objs.lvl4 $(dirname ${x})/Makefile
+done
+
+# we do not add these to libpthread/PTNAME/sysdeps/arch
+for x in libc/*/*/*/Makefile.arch ; do
+	${RM} $(dirname ${x})/Makefile
+	${USE_CMD} extra/scripts/Makefile.arch.lvl4 $(dirname ${x})/Makefile
+done
+
+exit 0