Renamed arch specific Makefile.in to Makefile.arch, else if TARGET_ARCH does not exist, we reinclude the including Makefile. Moved arch/common fpu_control.h link creation into main Makefile.in. Updated the link creation script to remove all the other Makefiles

1 files changed, 4 insertions, 3 deletions

diff --git a/extra/scripts/create_links.sh b/extra/scripts/create_links.sh
index 86a0867dc..58bb84852 100755
--- a/extra/scripts/create_links.sh
+++ b/extra/scripts/create_links.sh
@@ -7,18 +7,19 @@ DIRS2="ldso/ldso ldso/libdl libpthread/linuxthreads libpthread/linuxthreads_db"
 OBJ4="common arm i386 mips powerpc x86_64"
 
 for x in ${DIRS} ; do
-	rm -f ${x}/Makefile
+	find ${x} -type f -name Makefile -exec rm -f {} \;
 	ln -sf ../extra/scripts/Makefile.libs.lvl1 ${x}/Makefile
 done
 
 for x in ${DIRS2} ; do
-	rm -f ${x}/Makefile
 	ln -sf ../../extra/scripts/Makefile.libs.lvl2 ${x}/Makefile
 done
 
 for x in ${OBJ4} ; do
-	rm -f libc/sysdeps/linux/${x}/Makefile
 	ln -sf ../../../../extra/scripts/Makefile.objs.lvl4 libc/sysdeps/linux/${x}/Makefile
 done
 
+rm -f Makefile
+ln -sf Makefile.in Makefile
+
 exit 0