OSDN Git Service

Rework the config system. Better utilize the Kconfig language
[uclinux-h8/uClibc.git] / Makefile
index 2c0e2d3..7fe64c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,22 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2003 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later
+# version.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
 #
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-# Makefile for uClibc
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
+# You should have received a copy of the GNU Library General
+# Public License along with this program; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA 02111-1307 USA
 
 
 #--------------------------------------------------------------
@@ -32,11 +28,14 @@ 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
+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 utils finished
 
 # In this section, we need .config
 -include .config.cmd
@@ -52,6 +51,9 @@ ifeq ($(strip $(HAVE_SHARED)),y)
        @$(MAKE) -C libutil shared
        @$(MAKE) -C libm shared
        @$(MAKE) -C libpthread shared
+ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
+       @$(MAKE) -C libintl shared
+endif
 else
 ifeq ($(SHARED_TARGET),)
        @echo
@@ -78,7 +80,7 @@ bogus $(SHARED_TARGET): lib/libc.a lib/main.o Makefile
                -L __CTOR_LIST__ -L __DTOR_LIST__                       \
                -L _current_shared_library_a5_offset_                   \
                $(SHARED_TARGET).gdb
-       ln -sf $(SHARED_TARGET).gdb .
+       $(LN) -sf $(SHARED_TARGET).gdb .
 endif
 
 finished: shared
@@ -92,17 +94,17 @@ finished: shared
 .PHONY: romfs
 romfs:
        @if [ "$(CONFIG_BINFMT_SHARED_FLAT)" = "y" ]; then \
-               [ -e $(ROMFSDIR)/lib ] || mkdir -p $(ROMFSDIR)/lib; \
+               [ -e $(ROMFSDIR)/lib ] || $(INSTALL) -d $(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 \
+       $(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 \
+           $(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 \
@@ -114,69 +116,39 @@ include/bits/uClibc_config.h: .config
        @if [ ! -x ./extra/config/conf ] ; then \
            make -C extra/config conf; \
        fi;
-       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
 
 headers: include/bits/uClibc_config.h
-       rm -f include/asm;
-       @if [ "$(TARGET_ARCH)" = "powerpc" ];then \
-           ln -fs $(KERNEL_SOURCE)/include/asm-ppc include/asm; \
-       elif [ "$(TARGET_ARCH)" = "mips" ];then \
-           ln -fs $(KERNEL_SOURCE)/include/asm-mips include/asm; \
-       elif [ "$(TARGET_ARCH)" = "mipsel" ];then \
-           ln -fs $(KERNEL_SOURCE)/include/asm-mips include/asm; \
-           cd $(shell pwd)/libc/sysdeps/linux; \
-           ln -fs mips mipsel; \
-           cd $(shell pwd)/ldso/ldso; \
-           ln -fs mips mipsel; \
-           cd $(shell pwd)/libpthread/linuxthreads/sysdeps; \
-           ln -fs mips mipsel; \
-       elif [ "$(TARGET_ARCH)" = "cris" ];then \
-               ln -fs $(KERNEL_SOURCE)/include/asm-cris include/asm; \
-       else \
-           if [ "$(UCLIBC_HAS_MMU)" != "y" ]; then \
-               if [ -d $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH)nommu ] ; then \
-                   ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH)nommu include/asm;\
-               else \
-                   ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm; \
-               fi; \
-           else \
-               ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm; \
-           fi; \
-       fi;
-       rm -f include/asm-generic;
-       ln -fs $(KERNEL_SOURCE)/include/asm-generic include/asm-generic; 
-       @if [ ! -f include/asm/unistd.h ] ; then \
-           set -e; \
-           echo " "; \
-           echo "The path '$(KERNEL_SOURCE)/include/asm' doesn't exist."; \
-           echo "I bet you did not set KERNEL_SOURCE, TARGET_ARCH or UCLIBC_HAS_MMU"; \
-           echo "correctly when you configured uClibc.  Please fix these settings."; \
-           echo " "; \
-           false; \
+ifeq ($(strip $(UCLIBC_HAS_MMU)),y)
+       @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH)
+else
+       @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
+endif
+       @if [ "$(TARGET_ARCH)" = "mipsel" ]; then \
+           $(LN) -fs mips libc/sysdeps/linux/mipsel; \
+           $(LN) -fs mips ldso/ldso/mipsel; \
+           $(LN) -fs mips libpthread/linuxthreads/sysdeps/mipsel; \
        fi;
-       rm -f include/linux include/scsi
-       ln -fs $(KERNEL_SOURCE)/include/linux include/linux
-       ln -fs $(KERNEL_SOURCE)/include/scsi include/scsi
        @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); \
@@ -187,8 +159,23 @@ headers: include/bits/uClibc_config.h
        else \
                mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
        fi
+       $(MAKE) -C libc/sysdeps/linux/common headers
        $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
 
+# Command used to download source code
+WGET:=wget --passive-ftp
+
+pregen: headers
+ifeq ($(strip $(UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA)),y)
+       (cd extra/locale; \
+       $(WGET) http://www.uclibc.org/downloads/uClibc-locale-030818.tgz);
+endif
+ifeq ($(strip $(UCLIBC_PREGENERATED_LOCALE_DATA)),y)
+       (cd extra/locale; zcat uClibc-locale-030818.tgz | tar -xvf -)
+       make -C extra/locale pregen
+endif
+
+
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 
 $(patsubst %, _dir_%, $(DIRS)) : dummy
@@ -197,28 +184,77 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy
 tags:
        ctags -R
 
-install: install_dev install_runtime install_toolchain install_utils finished2
+install: install_dev install_runtime install_utils finished2
 
 
 # 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/
+       $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/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);
+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
+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
+endif
+ifneq ($(strip $(UCLIBC_HAS_LOCALE)),y)
+       # Remove iconv header since locale support is disabled.
+       $(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
+endif
+ifneq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
+       # Remove libintl header since gettext support is disabled.
+       $(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
+endif
+ifneq ($(strip $(UCLIBC_HAS_WORDEXP)),y)
+       # Remove wordexp header since wordexp support is disabled.
+       $(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
+endif
+ifneq ($(strip $(UCLIBC_HAS_GLOB)),y)
+       # Remove glob header since glob support is disabled.
+       $(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
        -@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;
+       -find $(PREFIX)$(DEVEL_PREFIX) -name CVS | 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/
+       -$(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 f -name '*.a' | sed -e 's/lib\///'` ; do \
-               ln -sf $$i $(PREFIX)$(DEVEL_PREFIX)/lib/`echo $$i | sed -e 's/\.a$$/_pic.a/'`; \
+               $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)/lib/`echo $$i | sed -e 's/\.a$$/_pic.a/'`; \
        done
 endif
 
@@ -228,30 +264,17 @@ endif
 # system, use the "install_target" target instead... 
 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 -fa 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; \
+           $(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
@@ -261,25 +284,16 @@ endif
 
 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
+       $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/sbin
+       $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/usr/bin
+       $(INSTALL) -m 755 ldso/util/ldd \
+               $(PREFIX)$(RUNTIME_PREFIX)/usr/bin/ldd
+       $(INSTALL) -m 755 ldso/util/ldconfig \
+               $(PREFIX)$(RUNTIME_PREFIX)/sbin/ldconfig;
        # 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;
+       #$(INSTALL) -m 755 ldso/util/readelf \
+       #       $(PREFIX)$(RUNTIME_PREFIX)/usr/bin/readelf
 endif
 
 # Installs run-time libraries and helper apps in preparation for
@@ -288,40 +302,32 @@ endif
 # 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 \
+       $(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 \
+           $(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;
+       @$(MAKE) -C ldso/util ldd.target ldconfig.target #readelf.target
+       $(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/etc;
+       $(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/sbin;
+       $(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/ldconfig.target $(PREFIX)$(TARGET_PREFIX)/sbin/ldconfig;
+       #$(INSTALL) -m 755 ldso/util/readelf.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/readelf;
 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
+       $(INSTALL) -d $(PREFIX)$(TARGET_PREFIX)/usr/bin;
+       $(INSTALL) -m 755 libc/misc/wchar/iconv.target $(PREFIX)$(TARGET_PREFIX)/usr/bin/iconv
 endif
 
 finished2:
@@ -335,98 +341,90 @@ all: menuconfig
 
 # configuration
 # ---------------------------------------------------------------------------
-
 extra/config/conf:
        make -C extra/config conf
-       -@if [ ! -f .config ] ; then \
-               cp extra/Configs/Config.$(TARGET_ARCH).default .config; \
-       fi
 
 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
 
 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
        $(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
        @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/scsi 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; \
+           $(RM) ldso/ldso/mipsel; \
+           $(RM) libc/sysdeps/linux/mipsel; \
+           $(RM) 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 -fa 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 CVS  -exec $(RM) -r {} \; ;   \
                                                \
        tar -cvzf uClibc-$(VERSION).tar.gz uClibc-$(VERSION)/;