OSDN Git Service

"make utils" now successfully makes utils for target
[uclinux-h8/uClibc.git] / Makefile.in
index b593a64..7f03e96 100644 (file)
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -8,9 +8,11 @@
 #--------------------------------------------------------------
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
+clean_targets := clean realclean distclean \
+       objclean-y headers_clean-y utils_clean
 noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
-       defconfig allyesconfig allnoconfig clean distclean \
-       release dist tags
+       defconfig allyesconfig allnoconfig \
+       release dist tags help
 
 include $(top_builddir)Rules.mak
 sub_headers := headers
@@ -18,10 +20,21 @@ 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
@@ -36,11 +49,23 @@ 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: extra/config/conf .config
-       $(Q)$(INSTALL) -d $(dir $@)
-       $(Q)@$< -o $(top_srcdir)extra/Configs/Config.in
-       $(top_srcdir)extra/scripts/conf-header.sh .config > include/bits/uClibc_config.h
+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
 
+# The above doesn't work for threads, though. Just using check-symlinks for now.
+# XXX: FIXME: this is ugly
+MAKEFLAGS += -L
+include/config/linuxthreads/old.h include/config/linuxthreads/new.h:
+       @true
 
 # For the moment, we have to keep re-running this target
 # because the fix includes scripts rely on pre-processers
@@ -58,52 +83,83 @@ 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_COMMON))
-headers: include/bits/uClibc_config.h
-       $(Q)$(MAKE) headers-y
-       $(Q)\
-       set -e; \
-       if [ -e 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; \
-       for f in dl-osinfo.h hp-timing.h ; do \
-               $(LN) -fs ../libc/sysdeps/linux/common/$$f include/ ; \
-       done
-       $(Q)\
-       cd include/bits; \
-       set -e; \
-       for i in $(HEADERS_BITS_COMMON) ; do \
-               $(LN) -fs ../../libc/sysdeps/linux/common/bits/$$i .; \
-       done; \
-       for i in $(HEADERS_BITS_ARCH) ; do \
-               $(LN) -fs ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/$$i .; \
-       done; \
-       for i in $(HEADERS_BITS_SUBARCH) ; do \
-               $(LN) -fs ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(TARGET_SUBARCH)/$$i .; \
-       done
-       $(Q)\
-       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
-ifeq ($(UCLIBC_HAS_LOCALE),y)
-       $(MAKE) -C extra/locale locale_headers
+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
 
-pregen: headers
-       $(Q)\
-       set -e; \
+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
+
+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`; \
+       tmp=`mktemp include/bits/sysnum.h.XXXXXX 2>/dev/null || true`; \
        [ -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 \
@@ -111,7 +167,25 @@ pregen: headers
        else \
                mv -f $$tmp include/bits/sysnum.h; \
        fi
+       @# Ugly linux specific hack..
+       $(Q)if grep -q __NR_ $@; then true; else \
+               rm -f $@; \
+               echo "ERROR: Could not generate syscalls."; \
+               echo "Make sure that you have proper kernel headers."; \
+               echo "Your .config in KERNEL_HEADERS=\"\" was set to:"; \
+               echo "${KERNEL_HEADERS}"; \
+               exit 1; \
+       fi
 
+$(LOCAL_INSTALL_PATH):
+       $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX=/ \
+       DEVEL_PREFIX=/usr/ \
+       HOSTCC="$(HOSTCC)" \
+       install_kernel_headers
+       $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX=/ \
+       DEVEL_PREFIX=/usr/ \
+       HOSTCC="$(HOSTCC)" \
+       install
 
 install: install_runtime install_dev
 
@@ -131,8 +205,8 @@ install_headers: headers $(top_builddir)extra/scripts/unifdef
        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
        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
+       # Disabled. If libc-internal.h is needed, document here why!
+       #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
@@ -140,6 +214,13 @@ install_headers: headers $(top_builddir)extra/scripts/unifdef
        $(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
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/kernel_types.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/utmpx.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/atomic.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/atomic.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/sigcontextinfo.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/stackinfo.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_arch_features.h
 ifneq ($(UCLIBC_HAS_FLOATS),y)
        # Remove floating point related headers since float support is disabled.
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/complex.h
@@ -148,6 +229,7 @@ ifneq ($(UCLIBC_HAS_FLOATS),y)
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/math.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/tgmath.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_fpmax.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/math*.h
 endif
 ifneq ($(UCLIBC_HAS_FENV),y)
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/fenv.h \
@@ -211,6 +293,7 @@ ifneq ($(UCLIBC_HAS_THREADS),y)
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/*thread*.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/semaphore.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/*thread*.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/initspin.h
 endif
 ifneq ($(HAVE_SHARED),y)
        # Remove dlfcn header if we don't have shared libraries.
@@ -232,6 +315,8 @@ 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
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ucontext.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/regexp.h
 endif
 ifneq ($(UCLIBC_HAS_EPOLL),y)
        # Remove epoll.h since epoll_*() were disabled upon request
@@ -241,12 +326,6 @@ 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_SV4_DEPRECATED),y)
-       # Remove ustst.h since ustat 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
 ifneq ($(UCLIBC_HAS_PTY),y)
        # Remove pty.h since PTY support was disabled upon request
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/pty.h
@@ -256,6 +335,17 @@ ifneq ($(UCLIBC_LINUX_SPECIFIC),y)
        $(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/prctl.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/reboot.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sendfile.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/fsuid.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/signalfd.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/statfs.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/statfs.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/swap.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sysctl.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/vfs.h
+       $(RM) ${PREFIX}$(DEVEL_PREFIX)include/sys/sysinfo.h
 endif
 ifneq ($(UCLIBC_SV4_DEPRECATED),y)
        # Remove ustat.h since deprecated SV4 support was disabled upon request
@@ -263,20 +353,13 @@ ifneq ($(UCLIBC_SV4_DEPRECATED),y)
        $(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/mqueue.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/mqueue.h
        $(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
@@ -284,20 +367,42 @@ ifneq ($(UCLIBC_HAS_SOCKET),y)
        $(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
+ifneq ($(UCLIBC_HAS_SYSLOG),y)
+       # Remove syslog.h since the corresponding functionality is disabled
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/syslog.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/syslog.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/syslog*.h
+endif
+ifneq ($(UCLIBC_HAS_RPC),y)
+       $(RM) -r $(PREFIX)$(DEVEL_PREFIX)include/rpc
+endif
+ifneq ($(UCLIBC_HAS_IPV6),y)
+       # Remove IPv6 headers since the corresponding functionality is disabled
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/netinet/ip6.h
+       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/netinet/icmp6.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):' \
+               $(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; \
@@ -320,9 +425,9 @@ 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
@@ -331,19 +436,19 @@ 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$$//'` \
+                       $(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*-$(VERSION).so \
                $(PREFIX)$(RUNTIME_PREFIX)lib
-       cd lib && $(TAR) -cf - *.so.* | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib
+       (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); \
@@ -352,6 +457,8 @@ ifeq ($(HAVE_SHARED),y)
        fi
 endif
 
+hostutils:
+       $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" -C utils hostutils
 utils:
        $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
 
@@ -359,67 +466,53 @@ utils:
 install_utils: utils
        $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
 
-else # ifeq ($(HAVE_DOT_CONFIG),y)
-
-all: menuconfig
-
-headers:
-       @echo "Need to make a config file first, run: make menuconfig"
-       @false
+install_hostutils: hostutils
+       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install DOTHOST=.host
 
 endif # ifeq ($(HAVE_DOT_CONFIG),y)
 
-include/bits:
-       $(INSTALL) -d include/bits
+include/bits include/config:
+       @$(disp_mkdir)
+       $(Q)$(INSTALL) -d $@
 
 # configuration
 # ---------------------------------------------------------------------------
-extra/config/conf extra/config/mconf: include/bits
-# TODO: this results in "make[1]: `conf' is up to date" printed
-# on every rebuild, because extra/config/conf is already built
-# on previous make run. Make it "test -x $@ || ..." (simple & a bit wrong)
-# or "make -q -C extra/config $(notdir $@) || ..." (less readable)?
+extra/config/conf extra/config/mconf: | include/config
        $(Q)$(MAKE) -C extra/config $(notdir $@)
 
-menuconfig: extra/config/mconf include/bits
+menuconfig: extra/config/mconf
        $(Q)./extra/config/mconf extra/Configs/Config.in
 
-config: extra/config/conf include/bits
+config: extra/config/conf
        $(Q)./extra/config/conf extra/Configs/Config.in
 
-oldconfig: extra/config/conf include/bits
+oldconfig: extra/config/conf
        $(Q)./extra/config/conf -o extra/Configs/Config.in
 
-silentoldconfig: extra/config/conf include/bits
+silentoldconfig: extra/config/conf
        $(Q)./extra/config/conf -s extra/Configs/Config.in
 
-randconfig: extra/config/conf include/bits
+randconfig: extra/config/conf
        $(Q)./extra/config/conf -r extra/Configs/Config.in
 
-allyesconfig: extra/config/conf include/bits
+allyesconfig: extra/config/conf
        $(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
+       $(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 include/bits
+allnoconfig: extra/config/conf
        $(Q)./extra/config/conf -n extra/Configs/Config.in
 
-defconfig: extra/config/conf include/bits
-       $(Q)./extra/config/conf -d extra/Configs/Config.in
+defconfig: extra/config/conf
+       $(Q)./extra/config/conf -d extra/Configs/Config.in \
+               -D extra/Configs/defconfigs/$(ARCH)
 
-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) objclean-y headers_clean-y
-       $(MAKE) -s -C test clean
-       $(MAKE) -C utils utils_clean
+include_clean:
+       $(Q)$(RM) include/fpu_control.h include/dl-osinfo.h include/hp-timing.h
        @set -e; \
        for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
                $(RM) include/sys/$$i; \
@@ -429,8 +522,14 @@ clean:
                        $(RM) include/sys/$$i; \
                done; \
        fi
+
+clean: include_clean
+       $(Q)$(RM) -r lib include/bits
+       @$(MAKE) -C utils utils_clean
+       +$(MAKE) -s -C test clean
        @$(RM) include/linux include/asm*
-       $(RM) $(top_builddir)extra/scripts/unifdef
+       $(Q)$(RM) $(top_builddir)extra/scripts/unifdef
+       $(Q)$(RM) -r $(LOCAL_INSTALL_PATH)
 
 distclean: clean
        -find . \( -name core -o -name \*.orig -o -name \*~ -o -name .\*.dep \) -exec $(RM) {} \;
@@ -444,5 +543,8 @@ dist release:
        $(TAR) cjf ../uClibc-$(VERSION).tar.bz2 -C .. uClibc-$(VERSION)
        du -b ../uClibc-$(VERSION).tar.bz2
 
-test check:
+test check: test_compile
        $(Q)$(MAKE) -C test
+
+test_compile: $(LOCAL_INSTALL_PATH)
+       $(Q)$(MAKE) -C test compile