OSDN Git Service

Rework the config system. Better utilize the Kconfig language
[uclinux-h8/uClibc.git] / Makefile
index c78b0a3..7fe64c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,66 +1,86 @@
 # 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
 
-#--------------------------------------------------------
-#
-#There are a number of configurable options in "Config"
-#
-#--------------------------------------------------------
 
+#--------------------------------------------------------------
+# You shouldn't need to mess with anything beyond this point...
+#--------------------------------------------------------------
+noconfig_targets := menuconfig config oldconfig randconfig \
+       defconfig allyesconfig allnoconfig clean distclean \
+       release tags TAGS
 TOPDIR=./
 include Rules.mak
 
-DIRS = extra ldso libc libcrypt libresolv libutil libm libpthread
+DIRS = ldso libc libcrypt libresolv libnsl libutil libm libpthread
+ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
+       DIRS += libintl
+endif
 
-all: headers include/bits/uClibc_config.h subdirs shared util finished
+ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
-Config:
-       @echo
-       @echo "You didn't read the README, did you... =)"
-       @echo "Choose a configuration file in extras/Config/ and then run"
-       @echo "  ln -s ./extra/Configs/Config.<arch> ./Config"
-       @echo
-       @exit 1
+all: headers pregen subdirs shared utils finished
+
+# In this section, we need .config
+-include .config.cmd
 
-shared:
-ifeq ($(strip $(HAVE_SHARED)),true)
+.PHONY: $(SHARED_TARGET)
+shared: $(SHARED_TARGET)
+ifeq ($(strip $(HAVE_SHARED)),y)
        @$(MAKE) -C libc shared
        @$(MAKE) -C ldso shared
        @$(MAKE) -C libcrypt shared
        @$(MAKE) -C libresolv shared
+       @$(MAKE) -C libnsl shared
        @$(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
        @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
 
-util:
-ifeq ($(strip $(HAVE_SHARED)),true)
-       @$(MAKE) -C ldso utils
+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 .
 endif
 
 finished: shared
@@ -69,173 +89,92 @@ finished: shared
        @echo
 
 #
-# dummy target for uClinux distro
+# Target for uClinux distro
 #
+.PHONY: romfs
 romfs:
-
-headers: dummy
-       rm -f include/asm;
-       @if [ $(TARGET_ARCH) = "powerpc" ];then \
-           ln -fs $(KERNEL_SOURCE)/include/asm-ppc include/asm; \
-       elif [ $(TARGET_ARCH) = "v850" ];then \
-           ln -fs $(KERNEL_SOURCE)/include/asm-v850 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) = "h8300" ];then \
-           ln -fs $(KERNEL_SOURCE)/include/asm-h8300 include/asm; \
-       else \
-           if [ $(HAS_MMU) != "true" ]; then \
-                       ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH)nommu include/asm;\
-               else \
-                       ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm; \
-               fi; \
+       @if [ "$(CONFIG_BINFMT_SHARED_FLAT)" = "y" ]; then \
+               [ -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 \
+               $(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;
-       @if [ ! -f include/asm/unistd.h ] ; then \
-           set -e; \
-           echo " "; \
-           echo "The path '$(KERNEL_SOURCE)/include/asm' doesn't exist."; \
-           echo "I bet you didn't set KERNEL_SOURCE, TARGET_ARCH or HAS_MMU in \`Config'"; \
-           echo "correctly.  Please edit \`Config' and fix these settings."; \
-           echo " "; \
-           /bin/false; \
+endif
+
+include/bits/uClibc_config.h: .config
+       @if [ ! -x ./extra/config/conf ] ; then \
+           make -C extra/config conf; \
        fi;
-       @if [ $(HAS_MMU) != "true" -a $(TARGET_ARCH) = "i386" ] ; then \
-           set -e; \
-           echo "WARNING: I bet your x86 system really has an MMU, right?"; \
-           echo "         malloc and friends won't work unless you fix \`Config'"; \
-           echo " "; \
-           sleep 10; \
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -o extra/Configs/Config.in
+
+headers: include/bits/uClibc_config.h
+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
-       rm -rf include/bits
-       mkdir -p include/bits
        @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; \
-       rm -f include/bits/syscall.h; \
-       TOPDIR=$(TOPDIR) CC=$(CC) /bin/sh $(TOPDIR)/extra/scripts/gen_bits_syscall_h.sh > include/bits/syscall.h
-       $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
-
-include/bits/uClibc_config.h: Makefile Config
-       @echo "/* WARNING!!! AUTO-GENERATED FILE!!! DO NOT EDIT!!! */" > include/bits/uClibc_config.h
-       @echo "#if !defined __FEATURES_H && !defined __need_uClibc_config_h" >> include/bits/uClibc_config.h
-       @echo "#error Never include <bits/uClibc_config.h> directly; use <features.h> instead." >> include/bits/uClibc_config.h
-       @echo "#endif" >> include/bits/uClibc_config.h
-       @echo "#define __UCLIBC_MAJOR__ $(MAJOR_VERSION)" >> include/bits/uClibc_config.h 
-       @echo "#define __UCLIBC_MINOR__ $(MINOR_VERSION)" >> include/bits/uClibc_config.h 
-       @echo "#define __UCLIBC_SUBLEVEL__ $(SUBLEVEL)" >> include/bits/uClibc_config.h 
-       @echo "#define linux 1" >> include/bits/uClibc_config.h 
-       @echo "#define __linux__ 1" >> include/bits/uClibc_config.h 
-       @if [ "$(INCLUDE_IPV6)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_IPV6__ 1" >> include/bits/uClibc_config.h ; \
+       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 \
-           echo "#undef __UCLIBC_HAS_IPV6__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(HAS_MMU)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_MMU__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_MMU__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(HAS_FLOATING_POINT)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_FLOATS__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_FLOATS__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(HAS_LONG_LONG)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_LONG_LONG__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_LONG_LONG__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(HAS_LOCALE)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_LOCALE__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_LOCALE__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(HAS_WCHAR)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_WCHAR__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_WCHAR__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(HAVE_ELF)" = "false" ] ; then \
-           echo "#undef HAVE_ELF" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#define HAVE_ELF 1" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(HAVE_SHARED)" = "false" ] ; then \
-           echo "#undef HAVE_SHARED" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#define HAVE_SHARED 1" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(TARGET_ARCH)" = "sh" ] ; then \
-           echo "#define NO_UNDERSCORES 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef NO_UNDERSCORES" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(INCLUDE_RPC)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_RPC__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_RPC__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(UNIFIED_SYSCALL)" = "true" ] ; then \
-           echo "#define __UCLIBC_USE_UNIFIED_SYSCALL__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_USE_UNIFIED_SYSCALL__" >> include/bits/uClibc_config.h ; \
-       fi
-       @echo "#define C_SYMBOL_PREFIX "\""$(C_SYMBOL_PREFIX)"\" >> include/bits/uClibc_config.h
-       @if [ "$(DOLFS)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAVE_LFS__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAVE_LFS__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(INCLUDE_THREADS)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_THREADS__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_THREADS__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(INCLUDE_REGEX)" = "true" ] ; then \
-           echo "#define __UCLIBC_HAS_REGEX__ 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef __UCLIBC_HAS_REGEX__" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(UNIX98PTY_ONLY)" = "true" ] ; then \
-           echo "#define UNIX98PTY_ONLY 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef UNIX98PTY_ONLY" >> include/bits/uClibc_config.h ; \
-       fi
-       @if [ "$(ASSUME_DEVPTS)" = "true" ] ; then \
-           echo "#define ASSUME_DEVPTS 1" >> include/bits/uClibc_config.h ; \
-       else \
-           echo "#undef ASSUME_DEVPTS" >> include/bits/uClibc_config.h ; \
+               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))
 
@@ -245,23 +184,78 @@ $(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)),true)
-       -find lib/ -type l -name '*.so' -exec cp -a {} $(PREFIX)$(DEVEL_PREFIX)/lib ';'
+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 f -name '*.a' | sed -e 's/lib\///'` ; do \
+               $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)/lib/`echo $$i | sed -e 's/\.a$$/_pic.a/'`; \
+       done
 endif
 
 
@@ -269,43 +263,37 @@ endif
 # allowing cross development.  If you want to deploy to a target 
 # system, use the "install_target" target instead... 
 install_runtime:
-ifeq ($(strip $(HAVE_SHARED)),true)
-       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 -a lib/*.so.* $(PREFIX)$(DEVEL_PREFIX)/lib
+ifeq ($(strip $(HAVE_SHARED)),y)
+       $(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; \
-           mkdir -p $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
-           ln -s $(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-                       $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO) || true; \
+           $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+                       $(PREFIX)$(RUNTIME_PREFIX)/lib; \
        fi;
 endif
 
-install_toolchain:
-       install -d $(PREFIX)$(DEVEL_PREFIX)/lib
-       install -d $(PREFIX)$(DEVEL_PREFIX)/bin
-       install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin
-       $(MAKE) -C extra/gcc-uClibc install
-
-install_utils:
-ifeq ($(strip $(HAVE_SHARED)),true)
-       @$(MAKE) -C ldso utils
-       install -m 755 ldso/util/ldd $(PREFIX)$(DEVEL_PREFIX)/bin
-       ln -fs $(DEVEL_PREFIX)/bin/ldd $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd
+ifeq ($(strip $(HAVE_SHARED)),y)
+utils: $(TOPDIR)ldso/util/ldd
+       $(MAKE) -C ldso utils
+else
+utils: dummy
+endif
+
+install_utils: utils
+ifeq ($(strip $(HAVE_SHARED)),y)
+       $(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)$(DEVEL_PREFIX)/bin
-       #ln -fs $(DEVEL_PREFIX)/bin/readelf $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf
-       @if [ -x ldso/util/ldconfig ] ; then \
-           set -x -e; \
-           install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \
-           install -m 755 ldso/util/ldconfig $(PREFIX)$(DEVEL_PREFIX)/bin; \
-           ln -fs $(DEVEL_PREFIX)/sbin/ldconfig $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-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
@@ -313,32 +301,33 @@ endif
 # $PREFIX is set to, allowing you to package up the result for
 # deployment onto your target system.
 install_target:
-ifeq ($(strip $(HAVE_SHARED)),true)
-       install -d $(PREFIX)$(TARGET_PREFIX)/lib
-       install -d $(PREFIX)$(TARGET_PREFIX)/sbin
-       install -d $(PREFIX)$(TARGET_PREFIX)/usr/bin
-       install -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+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 -a lib/*.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; \
-           mkdir -p $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
-           ln -s $(TARGET_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-                       $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO) || true; \
        fi;
 endif
 
 install_target_utils:
-ifeq ($(strip $(HAVE_SHARED)),true)
-       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 -m 755 ldso/util/ldconfig.target $(PREFIX)$(TARGET_PREFIX)/sbin/ldconfig; \
-       fi;
+ifeq ($(strip $(HAVE_SHARED)),y)
+       @$(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
 endif
 
 finished2:
@@ -346,43 +335,101 @@ finished2:
        @echo Finished installing...
        @echo
 
+else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
+
+all: menuconfig
+
+# configuration
+# ---------------------------------------------------------------------------
+extra/config/conf:
+       make -C extra/config conf
+
+extra/config/mconf:
+       make -C extra/config ncurses mconf
 
-distclean 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
+menuconfig: extra/config/mconf
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/mconf extra/Configs/Config.in
+
+config: extra/config/conf
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf extra/Configs/Config.in
+
+oldconfig: extra/config/conf
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -o extra/Configs/Config.in
+
+randconfig: extra/config/conf
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -r extra/Configs/Config.in
+
+allyesconfig: extra/config/conf
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -y extra/Configs/Config.in
+
+allnoconfig: extra/config/conf
+       $(RM) -r include/bits
+       $(INSTALL) -d include/bits
+       @./extra/config/conf -n extra/Configs/Config.in
+
+defconfig: extra/config/conf
+       $(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) {} \;
+       @$(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" -o $(TARGET_ARCH) = "mips" ]; then \
-           rm -f libc/sysdeps/linux/$(TARGET_ARCH); \
-           rm -f ldso/ldso/$(TARGET_ARCH); \
-           rm -f libpthread/linuxthreads/sysdeps/$(TARGET_ARCH); \
+       @if [ "$(TARGET_ARCH)" = "mipsel" ]; then \
+           $(MAKE) -C libc/sysdeps/linux/mips clean; \
+           $(RM) ldso/ldso/mipsel; \
+           $(RM) libc/sysdeps/linux/mipsel; \
+           $(RM) libpthread/linuxthreads/sysdeps/mipsel; \
        fi;
 
-dist release: distclean
+distclean: clean
+       $(RM) .config .config.old .config.cmd
+       $(MAKE) -C extra clean
+
+release: distclean
        cd ..;                                  \
-       rm -rf uClibc-$(VERSION);               \
-       cp -a uClibc uClibc-$(VERSION);         \
+       $(RM) -r uClibc-$(VERSION);             \
+       cp -fa uClibc uClibc-$(VERSION);        \
+       find uClibc-$(VERSION)/ -type f         \
+           -name .\#* -exec $(RM) -r {} \; ;   \
        find uClibc-$(VERSION)/ -type d         \
-           -name .\#* -exec rm -rf {} \; ;     \
+           -name CVS  -exec $(RM) -r {} \; ;   \
                                                \
-       tar -cvzf uClibc-$(VERSION).tar.gz --exclude CVS uClibc-$(VERSION)/;
+       tar -cvzf uClibc-$(VERSION).tar.gz uClibc-$(VERSION)/;
+
+endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
+
+.PHONY: dummy subdirs release distclean clean config oldconfig menuconfig
 
-.PHONY: dummy subdirs release distclean clean