OSDN Git Service

utils should be built all the time (iconv), disable building readelf
[uclinux-h8/uClibc.git] / Makefile
index bb4d91b..8836c9d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,21 +28,23 @@ noconfig_targets := menuconfig config oldconfig randconfig \
 TOPDIR=./
 include Rules.mak
 
-DIRS = extra ldso libc libcrypt libresolv libnsl libutil libm libpthread
+DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread librt
 ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
        DIRS += libintl
 endif
 
 ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
-all: headers subdirs shared utils finished
+all: headers pregen subdirs shared finished
 
 # In this section, we need .config
 -include .config.cmd
 
-.PHONY: $(SHARED_TARGET)
-shared: $(SHARED_TARGET)
+shared: subdirs
 ifeq ($(strip $(HAVE_SHARED)),y)
+       $(SECHO)
+       $(SECHO) Building shared libraries ...
+       $(SECHO)
        @$(MAKE) -C libc shared
        @$(MAKE) -C ldso shared
        @$(MAKE) -C libcrypt shared
@@ -51,292 +53,240 @@ ifeq ($(strip $(HAVE_SHARED)),y)
        @$(MAKE) -C libutil shared
        @$(MAKE) -C libm shared
        @$(MAKE) -C libpthread shared
+       @$(MAKE) -C librt shared
 ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
        @$(MAKE) -C libintl shared
 endif
 else
-ifeq ($(SHARED_TARGET),)
-       @echo
-       @echo Not building shared libraries...
-       @echo
-endif
-endif
-
-ifneq ($(SHARED_TARGET),)
-
-lib/main.o: $(ROOTDIR)/lib/libc/main.c
-       $(CC) $(CFLAGS) $(ARCH_CFLAGS) -c -o $@ $(ROOTDIR)/lib/libc/main.c
-
-bogus $(SHARED_TARGET): lib/libc.a lib/main.o Makefile
-       make -C $(ROOTDIR) relink
-       $(CC) -nostartfiles -o $(SHARED_TARGET) $(ARCH_CFLAGS) -Wl,-elf2flt -nostdlib           \
-               -Wl,-shared-lib-id,${LIBID}                             \
-               lib/main.o \
-               -Wl,--whole-archive,lib/libc.a,-lgcc,--no-whole-archive
-       $(OBJCOPY) -L _GLOBAL_OFFSET_TABLE_ -L main -L __main -L _start \
-               -L __uClibc_main -L __uClibc_start_main -L lib_main \
-               -L _exit_dummy_ref              \
-               -L __do_global_dtors -L __do_global_ctors               \
-               -L __CTOR_LIST__ -L __DTOR_LIST__                       \
-               -L _current_shared_library_a5_offset_                   \
-               $(SHARED_TARGET).gdb
-       ln -sf $(SHARED_TARGET).gdb .
+       $(SECHO)
+       $(SECHO) Not building shared libraries ...
+       $(SECHO)
 endif
 
 finished: shared
-       @echo
-       @echo Finally finished compiling...
-       @echo
-
-#
-# Target for uClinux distro
-#
-.PHONY: romfs
-romfs:
-       @if [ "$(CONFIG_BINFMT_SHARED_FLAT)" = "y" ]; then \
-               [ -e $(ROMFSDIR)/lib ] || mkdir -p $(ROMFSDIR)/lib; \
-               $(ROMFSINST) $(SHARED_TARGET) /lib/lib$(LIBID).so; \
-       fi
-ifeq ($(strip $(HAVE_SHARED)),y)
-       install -d $(ROMFSDIR)/lib
-       install -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-               $(ROMFSDIR)/lib
-       cp -fa lib/*.so.* $(ROMFSDIR)/lib/.
-       @if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-           set -x -e; \
-           install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-                       $(ROMFSDIR)/lib; \
-               $(ROMFSINST) -s \
-                       /lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-                       /lib/ld-linux.so.2; \
-       fi;
-endif
+       $(SECHO)
+       $(SECHO) Finally finished compiling ...
+       $(SECHO)
 
 include/bits/uClibc_config.h: .config
        @if [ ! -x ./extra/config/conf ] ; then \
-           make -C extra/config conf; \
+           $(MAKE) -C extra/config conf; \
        fi;
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/conf -o extra/Configs/Config.$(TARGET_ARCH)
-
-headers: include/bits/uClibc_config.h
-ifeq ($(strip $(UCLIBC_HAS_MMU)),y)
-       @./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH)
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -o extra/Configs/Config.in
+
+# For the moment, we have to keep re-running this target 
+# because the fix includes scripts rely on pre-processers 
+# in order to generate the headers correctly :(.  That 
+# means we can't use the $(HOSTCC) in order to get the 
+# correct output.
+ifeq ($(strip $(ARCH_HAS_MMU)),y)
+export header_extra_args = 
 else
-       @./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
+export header_extra_args = -n
 endif
-       @if [ "$(TARGET_ARCH)" = "mipsel" ]; then \
-           (cd libc/sysdeps/linux; \
-           ln -fs mips mipsel); \
-           (cd ldso/ldso; \
-           ln -fs mips mipsel); \
-           (cd libpthread/linuxthreads/sysdeps; \
-           ln -fs mips mipsel); \
-       fi;
+headers: include/bits/uClibc_config.h
+       @$(SHELL_SET_X); \
+       ./extra/scripts/fix_includes.sh \
+               -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
+               $(header_extra_args)
        @cd include/bits; \
        set -e; \
        for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
-               ln -fs $$i .; \
+               $(LN) -fs $$i .; \
        done; \
        if [ -d ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits ] ; then \
                for i in `ls ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/*.h` ; do \
-                       ln -fs $$i .; \
+                       $(LN) -fs $$i .; \
                done; \
        fi
        @cd include/sys; \
        set -e; \
        for i in `ls ../../libc/sysdeps/linux/common/sys/*.h` ; do \
-               ln -fs $$i .; \
+               $(LN) -fs $$i .; \
        done; \
        if [ -d ../../libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
                for i in `ls ../../libc/sysdeps/linux/$(TARGET_ARCH)/sys/*.h` ; do \
-                       ln -fs $$i .; \
+                       $(LN) -fs $$i .; \
                done; \
        fi
        @cd $(TOPDIR); \
-       set -x -e; \
+       set -e; \
+       $(SHELL_SET_X); \
        TOPDIR=. CC="$(CC)" /bin/sh extra/scripts/gen_bits_syscall_h.sh > include/bits/sysnum.h.new; \
        if cmp include/bits/sysnum.h include/bits/sysnum.h.new >/dev/null 2>&1; then \
                $(RM) include/bits/sysnum.h.new; \
        else \
                mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
        fi
+       $(MAKE) -C libpthread headers
+       $(MAKE) -C libc/sysdeps/linux/common headers
        $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
 
-subdirs: $(patsubst %, _dir_%, $(DIRS))
+# Command used to download source code
+WGET:=wget --passive-ftp
+
+LOCALE_DATA_FILENAME:=uClibc-locale-030818.tgz
+
+pregen: headers
+ifeq ($(strip $(UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA)),y)
+       (cd extra/locale; \
+       if [ ! -f $(LOCALE_DATA_FILENAME) ] ; then \
+       $(WGET) http://www.uclibc.org/downloads/$(LOCALE_DATA_FILENAME) ; \
+       fi );
+endif
+ifeq ($(strip $(UCLIBC_PREGENERATED_LOCALE_DATA)),y)
+       (cd extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
+       $(MAKE) -C extra/locale pregen
+endif
 
-$(patsubst %, _dir_%, $(DIRS)) : dummy
+
+subdirs: $(patsubst %, _dir_%, $(DIRS))
+$(patsubst %, _dir_%, $(DIRS)): headers
        $(MAKE) -C $(patsubst _dir_%, %, $@)
 
 tags:
        ctags -R
 
-install: install_dev install_runtime install_toolchain install_utils finished2
+install: install_runtime install_dev finished2
 
 
+RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
+
 # Installs header files and development library links.
 install_dev:
-       install -d $(PREFIX)$(DEVEL_PREFIX)/lib
-       install -d $(PREFIX)$(DEVEL_PREFIX)/usr/lib
-       install -d $(PREFIX)$(DEVEL_PREFIX)/include
-       -install -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)/lib/
-       tar -chf - include | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX);
+       $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
+       $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
+       -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
+       if [ "$(KERNEL_SOURCE)" == "$(DEVEL_PREFIX)" ] ; then \
+               extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \
+       else \
+               extra_exclude="" ; \
+       fi ; \
+       tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \
+               | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX)
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
+ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)
+       # Remove floating point related headers since float support is disabled.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/complex.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/fpu_control.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ieee754.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/math.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/tgmath.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_fpmax.h
+endif
 ifneq ($(strip $(UCLIBC_HAS_WCHAR)),y)
        # Remove wide char headers since wide char support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/wctype.h
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/wchar.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/wctype.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/wchar.h
 endif
 ifneq ($(strip $(UCLIBC_HAS_LOCALE)),y)
        # Remove iconv header since locale support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/iconv.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/iconv.h
+endif
+ifneq ($(strip $(UCLIBC_HAS_GLIBC_CUSTOM_PRINTF)),y)
+       # Remove printf header since custom print specifier support is disabled.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/printf.h
 endif
 ifneq ($(strip $(UCLIBC_HAS_XLOCALE)),y)
        # Remove xlocale header since extended locale support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/xlocale.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/xlocale.h
 endif
 ifneq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
        # Remove libintl header since gettext support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/libintl.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/libintl.h
 endif
 ifneq ($(strip $(UCLIBC_HAS_REGEX)),y)
        # Remove regex headers since regex support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/regex.h
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/regexp.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/regex.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/regexp.h
 endif
 ifneq ($(strip $(UCLIBC_HAS_WORDEXP)),y)
        # Remove wordexp header since wordexp support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/wordexp.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/wordexp.h
 endif
 ifneq ($(strip $(UCLIBC_HAS_FTW)),y)
        # Remove ftw header since ftw support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/ftw.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ftw.h
 endif
 ifneq ($(strip $(UCLIBC_HAS_GLOB)),y)
        # Remove glob header since glob support is disabled.
-       rm $(PREFIX)$(DEVEL_PREFIX)/include/glob.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/glob.h
+endif
+ifneq ($(strip $(UCLIBC_HAS_GNU_GETOPT)),y)
+       # Remove getopt header since gnu getopt support is disabled.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/getopt.h
+endif
+ifneq ($(strip $(HAS_SHADOW)),y)
+       # Remove shadow header since shadow password support is disabled.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/shadow.h
+endif
+ifneq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+       # Remove thread_db header since thread debug support is disabled.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/thread_db.h
+endif
+ifneq ($(strip $(UCLIBC_HAS_THREADS)),y)
+       # Remove pthread headers since thread support is disabled.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/*thread*.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/semaphore.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/*thread*.h
 endif
        -@for i in `find  $(PREFIX)$(DEVEL_PREFIX) -type d` ; do \
-           chmod -f 755 $$i; chmod -f 644 $$i/*.h; \
+           chmod 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \
        done;
-       -find $(PREFIX)$(DEVEL_PREFIX) -name CVS | xargs rm -rf;
-       -chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1.\2/'` $(PREFIX)$(DEVEL_PREFIX)
+       -find $(PREFIX)$(DEVEL_PREFIX) -name .svn | xargs $(RM) -r;
+       -chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1:\2/'` $(PREFIX)$(DEVEL_PREFIX)
 ifeq ($(strip $(HAVE_SHARED)),y)
-       -install -m 644 lib/*.so $(PREFIX)$(DEVEL_PREFIX)/lib/
-       -find lib/ -type l -name '*.so' -exec cp -fa {} $(PREFIX)$(DEVEL_PREFIX)/lib ';'
-       # If we build shared libraries then the static libs are PIC...
-       # Make _pic.a symlinks to make mklibs.py and similar tools happy.
+       for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \
+       sed -e 's/lib\///'` ; do \
+               $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
+               $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
+       done;
+ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
+       $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
+               $(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so
+endif
+#      # If we build shared libraries then the static libs are PIC...
+#      # Make _pic.a symlinks to make mklibs.py and similar tools happy.
        for i in `find lib/  -type f -name '*.a' | sed -e 's/lib\///'` ; do \
-               ln -sf $$i $(PREFIX)$(DEVEL_PREFIX)/lib/`echo $$i | sed -e 's/\.a$$/_pic.a/'`; \
-       done
+               $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \
+                       | sed -e 's/\.a$$/_pic.a/'`; \
+       done;
+       # Ugh!!! Remember that libdl.a and libdl_pic.a are different.  Since
+       # libdl is pretty small, and not likely to benefit from mklibs.py and
+       # similar, lets just remove libdl_pic.a and avoid the issue
+       rm -f $(PREFIX)$(DEVEL_PREFIX)lib/libdl_pic.a
 endif
 
 
-# Installs run-time libraries and helper apps onto the host system
-# allowing cross development.  If you want to deploy to a target 
-# system, use the "install_target" target instead... 
+# Installs run-time libraries
 install_runtime:
 ifeq ($(strip $(HAVE_SHARED)),y)
-       install -d $(PREFIX)$(DEVEL_PREFIX)/lib
-       install -d $(PREFIX)$(DEVEL_PREFIX)/bin
-       install -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-               $(PREFIX)$(DEVEL_PREFIX)/lib
-       cp -fa lib/*.so.* $(PREFIX)$(DEVEL_PREFIX)/lib
+       $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
+       $(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+               $(PREFIX)$(RUNTIME_PREFIX)lib
+       cp -dRf lib/*.so.* $(PREFIX)$(RUNTIME_PREFIX)lib
        @if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-           set -x -e; \
-           install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-                       $(PREFIX)$(DEVEL_PREFIX)/lib; \
+           set -e; \
+               $(SHELL_SET_X); \
+           $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+                       $(PREFIX)$(RUNTIME_PREFIX)lib; \
        fi;
-       #@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-       #    install -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
-       #    ln -sf $(PREFIX)$(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-       #               $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \
-       #fi;
 endif
 
-install_toolchain:
-       install -d $(PREFIX)$(DEVEL_PREFIX)/lib
-       install -d $(PREFIX)$(DEVEL_PREFIX)/bin
-       install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin
-       install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin
-       $(MAKE) -C extra/gcc-uClibc install
-
-ifeq ($(strip $(HAVE_SHARED)),y)
-utils: $(TOPDIR)ldso/util/ldd
-       $(MAKE) -C ldso utils
-else
-utils: dummy
-endif
+.PHONY: utils
+utils:
+       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
 
+# Installs helper applications, such as 'ldd' and 'ldconfig'
 install_utils: utils
-ifeq ($(strip $(HAVE_SHARED)),y)
-       install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin;
-       install -m 755 ldso/util/ldd \
-               $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd
-       ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd \
-               $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldd
-       # For now, don't bother with readelf since surely the host
-       # system has binutils, or we couldn't have gotten this far...
-       #install -m 755 ldso/util/readelf \
-       #       $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf
-       #ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf \
-       #       $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/readelf
-       @if [ -x ldso/util/ldconfig ] ; then \
-           set -x -e; \
-           install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \
-           install -m 755 ldso/util/ldconfig \
-                   $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \
-           ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig \
-                   $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldconfig; \
-       fi;
-endif
-
-# Installs run-time libraries and helper apps in preparation for
-# deploying onto a target system, but installed below wherever
-# $PREFIX is set to, allowing you to package up the result for
-# deployment onto your target system.
-install_target:
-ifeq ($(strip $(HAVE_SHARED)),y)
-       install -d $(PREFIX)$(TARGET_PREFIX)/lib
-       install -d $(PREFIX)$(TARGET_PREFIX)/usr/bin
-       install -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-               $(PREFIX)$(TARGET_PREFIX)/lib
-       cp -fa lib/*.so.* $(PREFIX)$(TARGET_PREFIX)/lib
-       @if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-           set -x -e; \
-           install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-                       $(PREFIX)$(TARGET_PREFIX)/lib; \
-       fi;
-       #@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-       #    install -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
-       #    ln -sf $(PREFIX)$(TARGET_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-       #               $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \
-       #fi;
-endif
-
-install_target_utils:
-ifeq ($(strip $(HAVE_SHARED)),y)
-       @$(MAKE) -C ldso/util ldd.target readelf.target #ldconfig.target
-       install -d $(PREFIX)$(TARGET_PREFIX)/usr/bin;
-       install -m 755 ldso/util/ldd.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/ldd
-       install -m 755 ldso/util/readelf.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/readelf
-       @if [ -x ldso/util/ldconfig.target ] ; then \
-           set -x -e; \
-           install -d $(PREFIX)$(TARGET_PREFIX)/etc; \
-           install -d $(PREFIX)$(TARGET_PREFIX)/sbin; \
-           install -m 755 ldso/util/ldconfig.target $(PREFIX)$(TARGET_PREFIX)/sbin/ldconfig; \
-       fi;
-endif
-ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
-       @$(MAKE) -C libc/misc/wchar iconv.target
-       install -d $(PREFIX)$(TARGET_PREFIX)/usr/bin;
-       install -m 755 libc/misc/wchar/iconv.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/iconv
-endif
+       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils install
 
 finished2:
-       @echo
-       @echo Finished installing...
-       @echo
+       $(SECHO)
+       $(SECHO) Finished installing ...
+       $(SECHO)
 
 else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
@@ -344,103 +294,98 @@ all: menuconfig
 
 # configuration
 # ---------------------------------------------------------------------------
-
 extra/config/conf:
-       make -C extra/config conf
-       -@if [ ! -f .config ] ; then \
-               cp extra/Configs/Config.$(TARGET_ARCH).default .config; \
-       fi
+       $(MAKE) -C extra/config conf
 
 extra/config/mconf:
-       make -C extra/config ncurses conf mconf
-       -@if [ ! -f .config ] ; then \
-               cp extra/Configs/Config.$(TARGET_ARCH).default .config; \
-       fi
+       $(MAKE) -C extra/config ncurses mconf
 
 menuconfig: extra/config/mconf
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/mconf extra/Configs/Config.$(TARGET_ARCH)
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/mconf extra/Configs/Config.in
 
 config: extra/config/conf
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/conf extra/Configs/Config.$(TARGET_ARCH)
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf extra/Configs/Config.in
 
 oldconfig: extra/config/conf
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/conf -o extra/Configs/Config.$(TARGET_ARCH)
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -o extra/Configs/Config.in
 
 randconfig: extra/config/conf
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/conf -r extra/Configs/Config.$(TARGET_ARCH)
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -r extra/Configs/Config.in
 
 allyesconfig: extra/config/conf
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/conf -y extra/Configs/Config.$(TARGET_ARCH)
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -y extra/Configs/Config.in
+       sed -i -e "s/^DODEBUG=.*/# DODEBUG is not set/" .config
+       sed -i -e "s/^DOASSERTS=.*/# DOASSERTS is not set/" .config
+       sed -i -e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" .config
+       sed -i -e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" .config
+       sed -i -e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" .config
+       @./extra/config/conf -o extra/Configs/Config.in
 
 allnoconfig: extra/config/conf
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/conf -n extra/Configs/Config.$(TARGET_ARCH)
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -n extra/Configs/Config.in
 
 defconfig: extra/config/conf
-       rm -rf include/bits
-       mkdir -p include/bits
-       @./extra/config/conf -d extra/Configs/Config.$(TARGET_ARCH)
-
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -d extra/Configs/Config.in
 
 clean:
-       - find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core -o -name .\#\* \) -exec rm -f {} \;
-       @rm -rf tmp lib include/bits libc/tmp _install
+       - find . \( -name \*.o -o -name \*.a -o -name \*.so -o -name core -o -name .\#\* \) -exec $(RM) {} \;
+       @$(RM) -r tmp lib include/bits libc/tmp _install
+       $(RM) libc/obj.* headers
        $(MAKE) -C test clean
        $(MAKE) -C ldso clean
        $(MAKE) -C libc/misc/internals clean
        $(MAKE) -C libc/misc/wchar clean
        $(MAKE) -C libc/unistd clean
        $(MAKE) -C libc/sysdeps/linux/common clean
-       $(MAKE) -C extra/gcc-uClibc clean
        $(MAKE) -C extra/locale clean
+       $(MAKE) -C utils clean
+       $(MAKE) -C libpthread clean
        @set -e; \
        for i in `(cd $(TOPDIR)/libc/sysdeps/linux/common/sys; ls *.h)` ; do \
-               rm -f include/sys/$$i; \
+               $(RM) include/sys/$$i; \
        done; \
        if [ -d libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
                for i in `(cd libc/sysdeps/linux/$(TARGET_ARCH)/sys; ls *.h)` ; do \
-                       rm -f include/sys/$$i; \
+                       $(RM) include/sys/$$i; \
                done; \
        fi;
-       @rm -f include/linux include/scsi include/asm
+       @$(RM) include/linux include/asm*
        @if [ -d libc/sysdeps/linux/$(TARGET_ARCH) ]; then              \
            $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) clean;         \
        fi;
-       @if [ "$(TARGET_ARCH)" = "mipsel" ]; then \
-           $(MAKE) -C libc/sysdeps/linux/mips clean; \
-           rm -f ldso/ldso/mipsel; \
-           rm -f libc/sysdeps/linux/mipsel; \
-           rm -f libpthread/linuxthreads/sysdeps/mipsel; \
-       fi;
 
 distclean: clean
-       rm -f .config .config.old .config.cmd
+       $(RM) .config .config.old .config.cmd
        $(MAKE) -C extra clean
 
 release: distclean
        cd ..;                                  \
-       rm -rf uClibc-$(VERSION);               \
-       cp -fa uClibc uClibc-$(VERSION);                \
+       $(RM) -r uClibc-$(VERSION);             \
+       cp -dRf uClibc uClibc-$(VERSION);       \
        find uClibc-$(VERSION)/ -type f         \
-           -name .\#* -exec rm -rf {} \; ;     \
+           -name .\#* -exec $(RM) -r {} \; ;   \
        find uClibc-$(VERSION)/ -type d         \
-           -name CVS  -exec rm -rf {} \; ;     \
+           -name .svn -exec $(RM) -r {} \; ;   \
                                                \
        tar -cvzf uClibc-$(VERSION).tar.gz uClibc-$(VERSION)/;
 
 endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
-.PHONY: dummy subdirs release distclean clean config oldconfig menuconfig
-
+check:
+       $(MAKE) -C test
 
+.PHONY: dummy subdirs release distclean clean config oldconfig menuconfig