Use consequently headers-y and headers_clean-y, try avoiding TARGET_ARCH use in main...

diff --git a/Makefile.in b/Makefile.in
index 511048d..d70d1eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,11 +107,13 @@ headers: $(top_srcdir)include/bits/uClibc_config.h
                $(RM) include/bits/sysnum.h; \
                mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
        fi
+ifeq ($(HAVE_SHARED),y)
+       $(MAKE) -C ldso headers-y
+endif
 ifeq ($(UCLIBC_HAS_THREADS),y)
-       $(MAKE) -C libpthread threads_headers
+       $(MAKE) -C libpthread headers-y
 endif
-       $(MAKE) -C libc/sysdeps/linux/common common_headers
-       $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) arch_headers
+       $(MAKE) -C libc/sysdeps/linux headers-y
 
 # Command used to download source code
 WGET:=wget --passive-ftp
@@ -369,6 +371,7 @@ clean:
        $(MAKE) -C extra/locale clean
        $(MAKE) -C ldso headers_clean-y
        $(MAKE) -C libpthread headers_clean-y
+       $(MAKE) -C libc/sysdeps/linux headers_clean-y
        $(MAKE) -C test clean
        $(MAKE) -C utils clean
        @set -e; \
@@ -381,9 +384,6 @@ clean:
                done; \
        fi
        @$(RM) include/linux include/asm*
-       @if [ -f libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch ]; then \
-           $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers_clean-y; \
-       fi
        -find . \( -name \*.o -o -name \*.os -o -name \*.oS \) -exec $(RM) {} \;
 
 distclean: clean

diff --git a/Makerules b/Makerules
index b6896c6..6ab9039 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -76,7 +76,7 @@ crt-y: $(crt-y)
 $(crt-y): $(CRTS) $(CTOR_TARGETS)
 
 other-y: $(other-y)
-headers: $(headers-y)
+headers-y: $(headers-y)
 
 objclean-y: $(objclean-y)
 headers_clean-y: $(headers_clean-y)

diff --git a/extra/scripts/create_links.sh b/extra/scripts/create_links.sh
index 58bb848..82bf5df 100755 (executable)
--- a/extra/scripts/create_links.sh
+++ b/extra/scripts/create_links.sh
@@ -4,7 +4,6 @@
 
 DIRS="ldso libc libcrypt libintl libm libnsl libpthread libresolv librt libutil"
 DIRS2="ldso/ldso ldso/libdl libpthread/linuxthreads libpthread/linuxthreads_db"
-OBJ4="common arm i386 mips powerpc x86_64"
 
 for x in ${DIRS} ; do
        find ${x} -type f -name Makefile -exec rm -f {} \;
@@ -15,9 +14,8 @@ for x in ${DIRS2} ; do
        ln -sf ../../extra/scripts/Makefile.libs.lvl2 ${x}/Makefile
 done
 
-for x in ${OBJ4} ; do
-       ln -sf ../../../../extra/scripts/Makefile.objs.lvl4 libc/sysdeps/linux/${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