OSDN Git Service

- fix locale dependencies and make default locale generation less verbose.
[uclinux-h8/uClibc.git] / Makefile.in
index 2011d37..5b666b8 100644 (file)
 #--------------------------------------------------------------
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
-noconfig_targets := menuconfig config oldconfig randconfig \
-       defconfig allyesconfig allnoconfig clean distclean \
-       release dist tags
+clean_targets := clean realclean distclean \
+       objclean-y headers_clean-y utils_clean
+noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
+       defconfig allyesconfig allnoconfig \
+       release dist tags help
 
 include $(top_builddir)Rules.mak
+sub_headers := headers
 
 ifeq ($(HAVE_DOT_CONFIG),y)
 
 all: pregen libs
+libs: pregen
 
 # In this section, we need .config
 -include .config.cmd
 
+else # ifeq ($(HAVE_DOT_CONFIG),y)
+
+all: menuconfig
+
+headers:
+       @echo "Need to make a config file first, run: make menuconfig"
+       @false
+
+endif # ifeq ($(HAVE_DOT_CONFIG),y)
+
 include $(top_srcdir)ldso/Makefile.in
 include $(top_srcdir)libcrypt/Makefile.in
 include $(top_srcdir)libintl/Makefile.in
 include $(top_srcdir)libm/Makefile.in
 include $(top_srcdir)libnsl/Makefile.in
 include $(top_srcdir)libresolv/Makefile.in
-include $(top_srcdir)librt/Makefile.in
 include $(top_srcdir)libutil/Makefile.in
 include $(top_srcdir)libpthread/Makefile.in
+include $(top_srcdir)librt/Makefile.in
+include $(top_srcdir)extra/locale/Makefile.in
 
 # last included to catch all the objects added by others (locales/threads)
 include $(top_srcdir)libc/Makefile.in
 
-include/bits/uClibc_config.h: .config
-       $(RM) -r include/bits
-       $(INSTALL) -d include/bits
-       @if [ ! -x extra/config/conf ] ; then \
-           $(MAKE) -C extra/config conf; \
-       fi
-       @extra/config/conf -o $(top_srcdir)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 
+ifeq ($(HAVE_DOT_CONFIG),y)
+# If the .config changes then we have to make sure that our includes are
+# updated properly. This would normally work by saying that the headers
+# have uClibc_config.h as prerequisite but since we _symlink_ the headers
+# and do not (?) want to rely on 'make -L' we better update them right here,
+# on spot to save us from alot of hazzle.
+include/bits/uClibc_config.h: extra/config/conf .config $(top_srcdir)extra/scripts/conf-header.sh | include/bits
+       @$(disp_gen)
+       $(Q)@$< -s $(top_srcdir)extra/Configs/Config.in
+       $(Q)$(top_srcdir)extra/scripts/conf-header.sh .config > $@
+       $(Q)$(MAKE) headers-y
+
+# 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 ($(ARCH_HAS_MMU),y)
-export header_extra_args = 
+ifeq ($(ARCH_USE_MMU),y)
+export header_extra_args =
 else
 export header_extra_args = -n
 endif
+HEADERS_BITS_COMMON := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/common/bits/*.h))
+HEADERS_BITS_ARCH   := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/*.h))
+HEADERS_BITS_SUBARCH :=
+ifneq ($(TARGET_SUBARCH),)
+HEADERS_BITS_SUBARCH := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(TARGET_SUBARCH)/*.h))
+endif
+HEADERS_BITS_COMMON := $(filter-out $(HEADERS_BITS_ARCH) $(HEADERS_BITS_SUBARCH) $(HEADERS_BITS_PTHREAD),$(HEADERS_BITS_COMMON))
+
+HEADERS_SYS_COMMON := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/common/sys/*.h))
+HEADERS_SYS_ARCH := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/sys/*.h))
+HEADERS_SYS_COMMON := $(filter-out $(HEADERS_SYS_ARCH),$(HEADERS_SYS_COMMON))
+
+ALL_HEADERS_COMMON       := include/fpu_control.h include/dl-osinfo.h \
+                               include/hp-timing.h
+ALL_HEADERS_BITS_COMMON  := $(addprefix include/bits/,$(HEADERS_BITS_COMMON))
+ALL_HEADERS_BITS_ARCH    := $(addprefix include/bits/,$(HEADERS_BITS_ARCH))
+ifneq ($(TARGET_SUBARCH),)
+ALL_HEADERS_BITS_SUBARCH := $(addprefix include/bits/,$(HEADERS_BITS_SUBARCH))
+else
+ALL_HEADERS_BITS_SUBARCH :=
+endif
+ALL_HEADERS_SYS_COMMON   := $(addprefix include/sys/,$(HEADERS_SYS_COMMON))
+ALL_HEADERS_SYS_ARCH     := $(addprefix include/sys/,$(HEADERS_SYS_ARCH))
+
+target-headers-sysdep := \
+       $(ALL_HEADERS_COMMON) \
+       $(ALL_HEADERS_BITS_COMMON) \
+       $(ALL_HEADERS_BITS_ARCH) \
+       $(ALL_HEADERS_BITS_SUBARCH) \
+       $(ALL_HEADERS_SYS_COMMON) \
+       $(ALL_HEADERS_SYS_ARCH)
+
+include/fpu_control.h:
+       @$(disp_ln)
+       $(Q)[ -r libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) ] && \
+               $(LN) -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) $@ || \
+               $(LN) -fs ../libc/sysdeps/linux/common/$(@F) $@
+
+include/dl-osinfo.h include/hp-timing.h:
+       $(do_ln) ../libc/sysdeps/linux/common/$(@F) $@
+
+$(ALL_HEADERS_BITS_COMMON):
+       $(do_ln) ../../libc/sysdeps/linux/common/bits/$(@F) $@
+
+$(ALL_HEADERS_BITS_ARCH):
+       $(do_ln) ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(@F) $@
+
+ifneq ($(TARGET_SUBARCH),)
+$(ALL_HEADERS_BITS_SUBARCH):
+       $(do_ln) ../../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(TARGET_SUBARCH)/$(@F) $@
+endif
+
+ifneq ($(strip $(ALL_HEADERS_SYS_COMMON)),)
+$(ALL_HEADERS_SYS_COMMON):
+       $(do_ln) ../../libc/sysdeps/linux/common/sys/$(@F) $@
+endif
+
+ifneq ($(strip $(ALL_HEADERS_SYS_ARCH)),)
+$(ALL_HEADERS_SYS_ARCH):
+       $(do_ln) ../../libc/sysdeps/linux/$(TARGET_ARCH)/sys/$(@F) $@
+endif
+
+$(target-headers-sysdep): | include/bits
+
+sysdep_common_headers-clean:
+       $(RM) $(ALL_HEADERS_COMMON)
+headers_clean-y += sysdep_common_headers-clean
+
+# The headers. Arch specific headers are specified via ARCH_HEADERS in
+# libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch which appends those via
+# libc/sysdeps/linux/Makefile.commonarch to headers-y
+headers-y += $(target-headers-sysdep)
+
 headers: include/bits/uClibc_config.h
-       $(MAKE) headers-y
-       @$(SHELL_SET_X); \
-       $(top_srcdir)extra/scripts/fix_includes.sh \
-               -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
-               $(header_extra_args)
-       if [ -f libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h ] ; then \
-               $(LN) -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h include/ ; \
-       else \
-               $(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h include/ ; \
-       fi
-       $(LN) -fs ../libc/sysdeps/linux/common/dl-osinfo.h include/
-       @cd include/bits; \
-       set -e; \
-       for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
-               $(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 .; \
-               done; \
-       fi
-       @cd include/sys; \
-       set -e; \
-       for i in `ls ../../libc/sysdeps/linux/common/sys/*.h` ; do \
-               $(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 .; \
-               done; \
-       fi
-       @cd $(top_builddir); \
-       set -e; \
-       $(SHELL_SET_X); \
-       top_builddir=. 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; \
+
+pregen: include/bits/sysnum.h headers
+
+include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh
+       $(Q)$(INSTALL) -d $(@D)
+       @$(disp_gen)
+       $(Q)set -e; \
+       cd $(top_builddir); \
+       tmp=`mktemp include/bits/sysnum.h.XXXXXX 2>/dev/null`; \
+       [ -z "$$tmp" ] && tmp='include/bits/sysnum.h.new'; \
+       KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \
+       if cmp include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \
+               $(RM) $$tmp; \
        else \
-               $(RM) include/bits/sysnum.h; \
-               mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
+               mv -f $$tmp include/bits/sysnum.h; \
        fi
 
-# Command used to download source code
-WGET:=wget --passive-ftp
-
-LOCALE_DATA_FILENAME:=uClibc-locale-030818.tgz
-
-pregen: headers
-ifeq ($(UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA),y)
-       (cd $(top_builddir)extra/locale; \
-       if [ ! -f $(LOCALE_DATA_FILENAME) ] ; then \
-       $(WGET) http://www.uclibc.org/downloads/$(LOCALE_DATA_FILENAME) ; \
-       fi )
-endif
-ifeq ($(UCLIBC_PREGENERATED_LOCALE_DATA),y)
-       (cd $(top_builddir)extra/locale; zcat $(LOCALE_DATA_FILENAME) | tar -xvf -)
-endif
-ifeq ($(UCLIBC_HAS_LOCALE),y)
-       $(MAKE) -C $(top_builddir)extra/locale locale_objs
-endif
+$(LOCAL_INSTALL_PATH):
+       $(Q)$(MAKE) PREFIX=$(shell pwd)/ RUNTIME_PREFIX=./ \
+       DEVEL_PREFIX=$(LOCAL_INSTALL_PATH)/usr/ \
+       HOSTCC="$(HOSTCC)" \
+       install_kernel_headers
+       $(Q)$(MAKE) PREFIX=$(shell pwd)/ RUNTIME_PREFIX=./ \
+       DEVEL_PREFIX=$(LOCAL_INSTALL_PATH)/usr/ \
+       HOSTCC="$(HOSTCC)" \
+       install_dev
 
 install: install_runtime install_dev
 
 
 RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
 
+$(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c
+       $(hcompile.u)
+
+# Installs kernel header files (linux/*, asm/*, asm-generic/*).
+install_kernel_headers: headers
+       top_builddir=$(top_builddir) \
+       $(top_srcdir)extra/scripts/install_kernel_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include
+
 # Installs header files.
-install_headers:
+install_headers: headers $(top_builddir)extra/scripts/unifdef
        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
-       if [ "$(KERNEL_SOURCE)" == "$(DEVEL_PREFIX)" ] ; then \
-               extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \
-       else \
-               extra_exclude="" ; \
-       fi ; \
-       tar -chf - --exclude .svn $$extra_exclude include \
-               | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX)
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ssp-internal.h
+       top_builddir=$(top_builddir) \
+       $(top_srcdir)extra/scripts/install_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include
+       printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
+               $(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
+       echo '/* Dont use _syscall#() macros; use the syscall() function */' > \
+               $(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/_lfs_64.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_uintmaxtostr.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/kernel_sigaction.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/kernel_stat.h
 ifneq ($(UCLIBC_HAS_FLOATS),y)
        # Remove floating point related headers since float support is disabled.
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/complex.h
@@ -140,6 +208,11 @@ ifneq ($(UCLIBC_HAS_FLOATS),y)
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/tgmath.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_fpmax.h
 endif
+ifneq ($(UCLIBC_HAS_FENV),y)
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/fenv.h \
+               $(PREFIX)$(DEVEL_PREFIX)include/bits/fenv.h \
+               $(PREFIX)$(DEVEL_PREFIX)include/bits/fenvinline.h
+endif
 ifneq ($(UCLIBC_HAS_WCHAR),y)
        # Remove wide char headers since wide char support is disabled.
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/wctype.h
@@ -179,10 +252,12 @@ ifneq ($(UCLIBC_HAS_GLOB),y)
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/glob.h
 endif
 ifneq ($(UCLIBC_HAS_GNU_GETOPT),y)
+ifneq ($(UCLIBC_HAS_GETOPT_LONG),y)
        # Remove getopt header since gnu getopt support is disabled.
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/getopt.h
 endif
-ifneq ($(HAS_SHADOW),y)
+endif
+ifneq ($(UCLIBC_HAS_SHADOW),y)
        # Remove shadow header since shadow password support is disabled.
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/shadow.h
 endif
@@ -196,28 +271,109 @@ ifneq ($(UCLIBC_HAS_THREADS),y)
        $(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 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \
-       done
-       -chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1:\2/'` $(PREFIX)$(DEVEL_PREFIX)
+ifneq ($(HAVE_SHARED),y)
+       # Remove dlfcn header if we don't have shared libraries.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dlfcn.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/dlfcn.h
+endif
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+       # Remove this as it is only used internally.
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/tls.h
+endif
+ifneq ($(UCLIBC_HAS_GNU_ERROR),y)
+       # Remove error.h upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/error.h
+endif
+ifneq ($(UCLIBC_HAS_BSD_ERR),y)
+       # Remove err.h upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/err.h
+endif
+ifneq ($(UCLIBC_SUSV3_LEGACY),y)
+       # Remove timeb.h since the LEGACY ftime() was disabled upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/timeb.h
+endif
+ifneq ($(UCLIBC_HAS_EPOLL),y)
+       # Remove epoll.h since epoll_*() were disabled upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/epoll.h
+endif
+ifneq ($(UCLIBC_HAS_XATTR),y)
+       # Remove xattr.h since extended attributes were disabled upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/xattr.h
+endif
+ifneq ($(UCLIBC_HAS_PTY),y)
+       # Remove pty.h since PTY support was disabled upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/pty.h
+endif
+ifneq ($(UCLIBC_LINUX_SPECIFIC),y)
+       # Remove linux-specific headers as requested
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/inotify.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/perm.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/personality.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/signalfd.h
+endif
+ifneq ($(UCLIBC_SV4_DEPRECATED),y)
+       # Remove ustat.h since deprecated SV4 support was disabled upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ustat.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/ustat.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/ustat.h
+endif
+ifeq ($(UCLIBC_HAS_REALTIME)$(UCLIBC_HAS_ADVANCED_REALTIME),)
+       # Remove SUSv-realtime related message-queue headers upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/mqueue.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/mqueue.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/mqueue.h
+endif
+ifneq ($(UCLIBC_HAS_REALTIME),y)
+       # Remove SUSv-realtime related headers upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sched.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sched.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/sched.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/semaphore.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/semaphore.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/semaphore.h
+endif
+ifneq ($(UCLIBC_HAS_SOCKET),y)
+       # Remove socket related headers upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/socket.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/socket.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/socketvar.h
+endif
+ifneq ($(UCLIBC_HAS_CRYPT),y)
+       # Remove crypt.h since libcrypt was disabled upon request
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/crypt.h
+endif
+ifneq ($(UCLIBC_SUPPORT_AI_ADDRCONFIG),y)
+       # Remove ifaddrs.h since the corresponding functionality is disabled
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ifaddrs.h
+endif
 
 # Installs development library links.
-install_dev: install_headers
+install_dev: install_headers all
        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
        -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
 ifeq ($(HAVE_SHARED),y)
        for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \
-       sed -e 's/lib\///'` ; do \
+       $(SED) -e 's/lib\///'` ; do \
                $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
                $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
        done
        if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
                $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
-               sed     -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
-                       -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \
-                       -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
-                       $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+               $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
+                   -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \
+                   -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
+                   $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
        fi
+ifeq ($(UCLIBC_HAS_THREADS),y)
+ifneq ($(LINUXTHREADS_OLD),y)
+       if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) ] ; then \
+               $(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+               cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+               echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/libpthread_nonshared.a )" \
+                       >> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+       fi
+endif
+endif
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
        $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
                $(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so
@@ -226,104 +382,97 @@ ifeq ($(DOPIC),y)
 #      # If we build shared libraries then the static libs are PIC...
 #      # Make _pic.a symlinks to make mklibs.py and similar tools happy.
        if [ -d lib ] ; then \
-               for i in `find lib/  -type f -name 'lib*.a' | sed -e 's/lib\///'` ; do \
+               for i in `find lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \
                        $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \
-                               | sed -e 's/\.a$$/_pic.a/'`; \
+                               | $(SED) -e 's/\.a$$/_pic.a/'`; \
                done ; \
        fi
 endif
 endif
+ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y)
+       for file in lib/lib*.gdb; do \
+               if test -f $$file; then \
+                       $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)lib; \
+                       $(INSTALL) -m 755 `echo $$file | $(SED) 's/\.gdb$$//'` \
+                         $(PREFIX)$(DEVEL_PREFIX)lib; \
+               fi; \
+       done
+endif
 
 # Installs run-time libraries
-install_runtime:
+install_runtime: all
 ifeq ($(HAVE_SHARED),y)
        $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
-       $(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
+       $(INSTALL) -m 644 lib/lib*-$(VERSION).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 -e; \
+       cd lib && $(TAR) -cf - *.so.* | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib
+       @if [ -x lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \
+               set -e; \
                $(SHELL_SET_X); \
-           $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-                       $(PREFIX)$(RUNTIME_PREFIX)lib; \
+               $(INSTALL) -m 755 lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \
+                       $(PREFIX)$(RUNTIME_PREFIX)lib; \
        fi
 endif
 
+hostutils:
+       $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" -C utils hostutils
 utils:
-       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
+       $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
 
 # Installs helper applications, such as 'ldd' and 'ldconfig'
 install_utils: utils
-       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils install
-
-else # ifeq ($(HAVE_DOT_CONFIG),y)
-
-all: menuconfig
-
-headers:
-       @echo "Need to make a config file first, run: make menuconfig"
-       @false
+       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
 
 endif # ifeq ($(HAVE_DOT_CONFIG),y)
 
+include/bits include/config:
+       @$(disp_mkdir)
+       $(Q)$(INSTALL) -d $@
+
 # configuration
 # ---------------------------------------------------------------------------
-extra/config/conf:
-       $(MAKE) -C extra/config conf
-
-extra/config/mconf:
-       $(MAKE) -C extra/config ncurses mconf
+extra/config/conf extra/config/mconf: | include/config
+       $(Q)$(MAKE) -C extra/config $(notdir $@)
 
 menuconfig: extra/config/mconf
-       $(RM) -r include/bits
-       $(INSTALL) -d include/bits
-       @./extra/config/mconf extra/Configs/Config.in
-       $(MAKE) headers
+       $(Q)./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
+       $(Q)./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
+       $(Q)./extra/config/conf -o extra/Configs/Config.in
+
+silentoldconfig: extra/config/conf
+       $(Q)./extra/config/conf -s extra/Configs/Config.in
 
 randconfig: extra/config/conf
-       $(RM) -r include/bits
-       $(INSTALL) -d include/bits
-       @./extra/config/conf -r extra/Configs/Config.in
+       $(Q)./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
-       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
+       $(Q)./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
+       $(Q)./extra/config/conf -o extra/Configs/Config.in
 
 allnoconfig: extra/config/conf
-       $(RM) -r include/bits
-       $(INSTALL) -d include/bits
-       @./extra/config/conf -n extra/Configs/Config.in
+       $(Q)./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
+       $(Q)./extra/config/conf -d extra/Configs/Config.in \
+               -D extra/Configs/defconfigs/$(ARCH)
 
 clean:
-       @$(RM) -r lib include/bits
-       $(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a
-       $(RM) include/fpu_control.h include/dl-osinfo.h
-       $(MAKE) -C extra/locale clean
-       $(MAKE) headers_clean-y
-       $(MAKE) -C test clean
-       $(MAKE) -C utils clean
+       $(Q)$(RM) -r lib include/bits
+       $(RM) ldso/*/*.a libpthread/*/*.a libc/*.a libcrypt/*.a libintl/*.a \
+               libm/*.a libnsl/*.a libpthread/*.a libresolv/*.a librt/*.a \
+               libutil/*.a lib/*.a \
+               include/fpu_control.h include/dl-osinfo.h include/hp-timing.h
+       +$(MAKE) -s -C test clean
+       +$(MAKE) -C utils utils_clean
        @set -e; \
        for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
                $(RM) include/sys/$$i; \
@@ -334,20 +483,23 @@ clean:
                done; \
        fi
        @$(RM) include/linux include/asm*
-       -find . \( -name \*.o -o -name \*.os -o -name \*.oS \) -exec $(RM) {} \;
+       $(RM) $(top_builddir)extra/scripts/unifdef
+       $(RM) -r $(LOCAL_INSTALL_PATH)
 
 distclean: clean
-       -find . \( -name core -o -name \*.orig -o -name \*~ \) -exec $(RM) {} \;
+       -find . \( -name core -o -name \*.orig -o -name \*~ -o -name .\*.dep \) -exec $(RM) {} \;
        $(RM) .config .config.old .config.cmd
        $(RM) extra/locale/*.tgz
-       $(MAKE) -C extra/config clean
+       $(MAKE) -C extra/config distclean
 
 dist release:
-       $(MAKE) -s distclean
-       $(RM) -r ../uClibc-$(VERSION) ../uClibc-$(VERSION).tar.gz
+       $(RM) -r ../uClibc-$(VERSION) ../uClibc-$(VERSION).tar.bz2
        svn -q export . ../uClibc-$(VERSION)
-       tar czf ../uClibc-$(VERSION).tar.gz -C .. uClibc-$(VERSION)
-       du -b ../uClibc-$(VERSION).tar.gz
+       $(TAR) cjf ../uClibc-$(VERSION).tar.bz2 -C .. uClibc-$(VERSION)
+       du -b ../uClibc-$(VERSION).tar.bz2
+
+test check: test_compile
+       $(Q)$(MAKE) -C test
 
-check:
-       $(MAKE) -C test
+test_compile: $(LOCAL_INSTALL_PATH)
+       $(Q)$(MAKE) -C test compile