OSDN Git Service

Add missing lowlevelrobustlock.c
[uclinux-h8/uClibc.git] / Makefile.in
index 4649181..c89d6fe 100644 (file)
@@ -14,16 +14,21 @@ noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
        defconfig allyesconfig allnoconfig \
        release dist tags help
 
-include $(top_builddir)Rules.mak
+include $(top_srcdir)Rules.mak
 sub_headers := headers
 
+ifndef KCONFIG_CONFIG
+KCONFIG_CONFIG := $(top_builddir).config
+endif
+export KCONFIG_CONFIG
+
 ifeq ($(HAVE_DOT_CONFIG),y)
 
 all: pregen libs
 libs: pregen
 
 # In this section, we need .config
--include .config.cmd
+-include $(top_builddir).config.cmd
 
 else # ifeq ($(HAVE_DOT_CONFIG),y)
 
@@ -55,16 +60,17 @@ ifeq ($(HAVE_DOT_CONFIG),y)
 # 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
+$(top_builddir)include/bits/uClibc_config.h: $(top_builddir)extra/config/conf $(KCONFIG_CONFIG) $(top_srcdir)extra/scripts/conf-header.sh | $(top_builddir)include/bits $(top_builddir)include/config
        @$(disp_gen)
        $(Q)@$< -s $(top_srcdir)extra/Configs/Config.in
-       $(Q)$(top_srcdir)extra/scripts/conf-header.sh .config > $@
+       $(Q)$(top_srcdir)extra/scripts/conf-header.sh $(KCONFIG_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:
+
+$(top_builddir)include/config/linuxthreads/old.h $(top_builddir)include/config/linuxthreads/new.h:
        @true
 
 # For the moment, we have to keep re-running this target
@@ -89,17 +95,18 @@ HEADERS_SYS_COMMON := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/common
 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))
+ALL_HEADERS_COMMON       := $(top_builddir)include/fpu_control.h \
+                               $(top_builddir)include/dl-osinfo.h \
+                               $(top_builddir)include/hp-timing.h
+ALL_HEADERS_BITS_COMMON  := $(addprefix $(top_builddir)include/bits/,$(HEADERS_BITS_COMMON))
+ALL_HEADERS_BITS_ARCH    := $(addprefix $(top_builddir)include/bits/,$(HEADERS_BITS_ARCH))
 ifneq ($(TARGET_SUBARCH),)
-ALL_HEADERS_BITS_SUBARCH := $(addprefix include/bits/,$(HEADERS_BITS_SUBARCH))
+ALL_HEADERS_BITS_SUBARCH := $(addprefix $(top_builddir)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))
+ALL_HEADERS_SYS_COMMON   := $(addprefix $(top_builddir)include/sys/,$(HEADERS_SYS_COMMON))
+ALL_HEADERS_SYS_ARCH     := $(addprefix $(top_builddir)include/sys/,$(HEADERS_SYS_ARCH))
 
 target-headers-sysdep := \
        $(ALL_HEADERS_COMMON) \
@@ -107,39 +114,40 @@ target-headers-sysdep := \
        $(ALL_HEADERS_BITS_ARCH) \
        $(ALL_HEADERS_BITS_SUBARCH) \
        $(ALL_HEADERS_SYS_COMMON) \
-       $(ALL_HEADERS_SYS_ARCH)
+       $(ALL_HEADERS_SYS_ARCH) \
+       $(ALL_HEADERS_BITS_PTHREAD)
 
-include/fpu_control.h:
+$(top_builddir)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) $@
+       $(Q)[ -r $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) ] && \
+               $(LN) -fs $(call rel_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) $@ || \
+               $(LN) -fs $(call rel_srcdir)libc/sysdeps/linux/common/$(@F) $@
 
-include/dl-osinfo.h include/hp-timing.h:
-       $(do_ln) ../libc/sysdeps/linux/common/$(@F) $@
+$(top_builddir)include/dl-osinfo.h $(top_builddir)include/hp-timing.h:
+       $(do_ln) $(call rel_srcdir)libc/sysdeps/linux/common/$(@F) $@
 
 $(ALL_HEADERS_BITS_COMMON):
-       $(do_ln) ../../libc/sysdeps/linux/common/bits/$(@F) $@
+       $(do_ln) $(call rel_srcdir)libc/sysdeps/linux/common/bits/$(@F) $@
 
 $(ALL_HEADERS_BITS_ARCH):
-       $(do_ln) ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(@F) $@
+       $(do_ln) $(call rel_srcdir)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) $@
+       $(do_ln) $(call rel_srcdir)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) $@
+       $(do_ln) $(call rel_srcdir)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) $@
+       $(do_ln) $(call rel_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/sys/$(@F) $@
 endif
 
-$(target-headers-sysdep): | include/bits
+$(target-headers-sysdep): | $(top_builddir)include/bits $(top_builddir)include/sys
 
 sysdep_common_headers-clean:
        $(RM) $(ALL_HEADERS_COMMON)
@@ -150,22 +158,22 @@ headers_clean-y += sysdep_common_headers-clean
 # libc/sysdeps/linux/Makefile.commonarch to headers-y
 headers-y += $(target-headers-sysdep)
 
-headers: include/bits/uClibc_config.h
+headers: $(top_builddir)include/bits/uClibc_config.h
+subdirs: $(addprefix $(top_builddir),$(subdirs))
+pregen: $(top_builddir)include/bits/sysnum.h headers subdirs $(pthread_pregen)
+       $(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers)
 
-pregen: include/bits/sysnum.h headers
-
-include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh
+$(top_builddir)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 || 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 \
+       tmp=`mktemp $(top_builddir)include/bits/sysnum.h.XXXXXX 2>/dev/null || true`; \
+       [ -z "$$tmp" ] && tmp='$(top_builddir)include/bits/sysnum.h.new'; \
+       KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir="$(top_builddir)" CC="$(CC) $(CPU_CFLAGS)" $(SHELL) $< > $$tmp; \
+       if cmp $(top_builddir)include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \
                $(RM) $$tmp; \
        else \
-               mv -f $$tmp include/bits/sysnum.h; \
+               mv -f $$tmp $(top_builddir)include/bits/sysnum.h; \
        fi
        @# Ugly linux specific hack..
        $(Q)if grep -q __NR_ $@; then true; else \
@@ -178,198 +186,121 @@ include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh
        fi
 
 $(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/ \
+       $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX=/ \
+       DEVEL_PREFIX=/usr/ \
        HOSTCC="$(HOSTCC)" \
-       install_dev
+       install
 
 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
+$(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c|$(@D)
        $(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.
+# a "y" here means the feature is enabled and so we should *not* rm it.
+# if the option expands to nothing though, we can punt the headers.
+HEADERS_RM- := \
+       dl-osinfo.h \
+       _lfs_64.h \
+       bits/uClibc_arch_features.h \
+       bits/kernel_sigaction.h \
+       bits/kernel_stat.h \
+       bits/kernel_types.h \
+       bits/syscalls.h \
+       bits/syscalls-common.h \
+       bits/utmpx.h \
+       bits/uClibc_errno.h \
+       bits/uClibc_uintmaxtostr.h \
+       atomic.h \
+       bits/atomic.h \
+       bits/sigcontextinfo.h \
+       bits/stackinfo.h \
+       tls.h \
+       rpc/des_crypt.h \
+       rpc/key_prot.h \
+       rpc/rpc_des.h \
+       sgtty.h
+HEADERS_RM-$(UCLIBC_HAS_FLOATS) += \
+       complex.h \
+       fpu_control.h \
+       ieee754.h \
+       math.h \
+       tgmath.h \
+       bits/uClibc_fpmax.h \
+       bits/math*.h
+HEADERS_RM-$(UCLIBC_HAS_GNU_GETOPT)$(UCLIBC_HAS_GETOPT_LONG) += getopt.h
+HEADERS_RM-$(UCLIBC_HAS_REALTIME) += \
+       mqueue.h \
+       bits/mqueue.h \
+       sched.h \
+       bits/sched.h \
+       semaphore.h
+HEADERS_RM-$(UCLIBC_HAS_THREADS) += \
+       *thread*.h \
+       semaphore.h \
+       bits/*thread*.h \
+       bits/initspin.h
+HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) += \
+       sys/fsuid.h \
+       sys/inotify.h \
+       sys/perm.h \
+       sys/personality.h \
+       sys/prctl.h \
+       sys/reboot.h \
+       sys/sendfile.h \
+       sys/signalfd.h \
+       bits/statfs.h \
+       sys/statfs.h \
+       sys/swap.h \
+       sys/sysctl.h \
+       sys/sysinfo.h \
+       sys/vfs.h
+HEADERS_RM-$(HAVE_SHARED)                    += dlfcn.h bits/dlfcn.h
+HEADERS_RM-$(PTHREADS_DEBUG_SUPPORT)         += thread_db.h
+HEADERS_RM-$(UCLIBC_HAS_BSD_ERR)             += err.h
+HEADERS_RM-$(UCLIBC_HAS_CRYPT)               += crypt.h
+HEADERS_RM-$(UCLIBC_HAS_EPOLL)               += sys/epoll.h
+HEADERS_RM-$(UCLIBC_HAS_FENV)                += fenv.h bits/fenv.h bits/fenvinline.h
+HEADERS_RM-$(findstring y,$(UCLIBC_HAS_FTW)$(UCLIBC_HAS_NFTW))  += ftw.h
+HEADERS_RM-$(UCLIBC_HAS_GETTEXT_AWARENESS)   += libintl.h
+HEADERS_RM-$(UCLIBC_HAS_GLIBC_CUSTOM_PRINTF) += printf.h
+HEADERS_RM-$(UCLIBC_HAS_GLOB)                += glob.h
+HEADERS_RM-$(UCLIBC_HAS_GNU_ERROR)           += error.h
+HEADERS_RM-$(UCLIBC_HAS_IPV6)                += netinet/ip6.h netinet/icmp6.h
+HEADERS_RM-$(UCLIBC_HAS_LOCALE)              += iconv.h
+HEADERS_RM-$(UCLIBC_HAS_PTY)                 += pty.h
+HEADERS_RM-$(UCLIBC_HAS_REGEX)               += regex.h regexp.h
+HEADERS_RM-$(UCLIBC_HAS_RPC)                 += rpc
+HEADERS_RM-$(UCLIBC_HAS_SHADOW)              += shadow.h
+HEADERS_RM-$(UCLIBC_HAS_SOCKET)              += sys/socket.h bits/socket.h sys/socketvar.h
+HEADERS_RM-$(UCLIBC_HAS_SYSLOG)              += syslog.h sys/syslog.h bits/syslog*.h
+HEADERS_RM-$(UCLIBC_HAS_WCHAR)               += wchar.h wctype.h
+HEADERS_RM-$(UCLIBC_HAS_WORDEXP)             += wordexp.h
+HEADERS_RM-$(UCLIBC_HAS_XATTR)               += sys/xattr.h
+HEADERS_RM-$(UCLIBC_HAS_XLOCALE)             += xlocale.h
+HEADERS_RM-$(UCLIBC_SUPPORT_AI_ADDRCONFIG)   += ifaddrs.h
+HEADERS_RM-$(UCLIBC_SV4_DEPRECATED)          += ustat.h sys/ustat.h bits/ustat.h
+HEADERS_RM-$(UCLIBC_SUSV3_LEGACY)            += sys/timeb.h regexp.h
+HEADERS_RM-$(UCLIBC_SUSV4_LEGACY)            += utime.h
+       # BREAKAGE: include/signal.h uses it, this rm broke bbox compile:
+       ### ucontext.h
+
 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
-       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
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/fpu_control.h
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ieee754.h
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/math.h
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/tgmath.h
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_fpmax.h
-endif
-ifneq ($(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
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/wchar.h
-endif
-ifneq ($(UCLIBC_HAS_LOCALE),y)
-       # Remove iconv header since locale support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/iconv.h
-endif
-ifneq ($(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 ($(UCLIBC_HAS_XLOCALE),y)
-       # Remove xlocale header since extended locale support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/xlocale.h
-endif
-ifneq ($(UCLIBC_HAS_GETTEXT_AWARENESS),y)
-       # Remove libintl header since gettext support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/libintl.h
-endif
-ifneq ($(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 ($(UCLIBC_HAS_WORDEXP),y)
-       # Remove wordexp header since wordexp support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/wordexp.h
-endif
-ifneq ($(UCLIBC_HAS_FTW),y)
-       # Remove ftw header since ftw support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/ftw.h
-endif
-ifneq ($(UCLIBC_HAS_GLOB),y)
-       # Remove glob header since glob support is disabled.
-       $(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
-endif
-ifneq ($(UCLIBC_HAS_SHADOW),y)
-       # Remove shadow header since shadow password support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/shadow.h
-endif
-ifneq ($(PTHREADS_DEBUG_SUPPORT),y)
-       # Remove thread_db header since thread debug support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/thread_db.h
-endif
-ifneq ($(UCLIBC_HAS_THREADS),y)
-       # Remove pthread headers since thread support is disabled.
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/*thread*.h
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/semaphore.h
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/*thread*.h
-endif
-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/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/sys/swap.h
-       $(RM) $(PREFIX)$(DEVEL_PREFIX)include/sys/sysctl.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
+       cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-)
+ifeq ($(UCLIBC_HAS_WCHAR),)
+       cd $(PREFIX)$(DEVEL_PREFIX)include && mv -f wchar-stub.h wchar.h
+else
+       cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -f wchar-stub.h
 endif
 
 # Installs development library links.
-install_dev: install_headers all
+install_dev: install_headers install_runtime
        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
        -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
 ifeq ($(HAVE_SHARED),y)
@@ -378,6 +309,7 @@ ifeq ($(HAVE_SHARED),y)
                $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
                $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
        done
+ifeq ($(HARDWIRED_ABSPATH),y)
        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):' \
@@ -385,14 +317,21 @@ ifeq ($(HAVE_SHARED),y)
                    -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
                    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
        fi
+else
+       -$(INSTALL) -m 755 lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/
+endif
 ifeq ($(UCLIBC_HAS_THREADS),y)
 ifneq ($(LINUXTHREADS_OLD),y)
+ifeq ($(HARDWIRED_ABSPATH),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
+else
+       -$(INSTALL) -m 755 lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/
+endif
 endif
 endif
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
@@ -424,7 +363,7 @@ endif
 install_runtime: all
 ifeq ($(HAVE_SHARED),y)
        $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
-       $(INSTALL) -m 644 lib/lib*-$(VERSION).so \
+       $(INSTALL) -m 755 lib/lib*-$(VERSION).so \
                $(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 \
@@ -435,86 +374,94 @@ 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
+       $(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 utils_install
+       $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
 
 endif # ifeq ($(HAVE_DOT_CONFIG),y)
 
-include/bits include/config:
-       @$(disp_mkdir)
-       $(Q)$(INSTALL) -d $@
+hostutils:
+       $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@
+
+install_hostutils: hostutils
+       $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils utils_install
+
+$(addprefix $(top_builddir),include/bits include/sys include/config extra/config/lxdialog extra/locale extra/scripts $(subdirs)):
+       $(do_mkdir)
 
 # configuration
 # ---------------------------------------------------------------------------
-extra/config/conf extra/config/mconf: | include/config
-       $(Q)$(MAKE) -C extra/config $(notdir $@)
+$(top_builddir)extra/config/conf $(top_builddir)extra/config/mconf: | $(top_builddir)include/config $(top_builddir)extra/config/lxdialog
+       $(Q)$(MAKE) -C extra/config $(@F)
 
-menuconfig: extra/config/mconf
-       $(Q)./extra/config/mconf extra/Configs/Config.in
+menuconfig: $(top_builddir)extra/config/mconf
+       $(Q)$(top_builddir)extra/config/mconf extra/Configs/Config.in
 
-config: extra/config/conf
-       $(Q)./extra/config/conf extra/Configs/Config.in
+config: $(top_builddir)extra/config/conf
+       $(Q)$(top_builddir)extra/config/conf extra/Configs/Config.in
 
-oldconfig: extra/config/conf
-       $(Q)./extra/config/conf -o extra/Configs/Config.in
+oldconfig: $(top_builddir)extra/config/conf
+       $(Q)$(top_builddir)extra/config/conf -o extra/Configs/Config.in
 
-silentoldconfig: extra/config/conf
-       $(Q)./extra/config/conf -s extra/Configs/Config.in
+silentoldconfig: $(top_builddir)extra/config/conf
+       $(Q)$(top_builddir)extra/config/conf -s extra/Configs/Config.in
 
-randconfig: extra/config/conf
-       $(Q)./extra/config/conf -r extra/Configs/Config.in
+randconfig: $(top_builddir)extra/config/conf
+       $(Q)$(top_builddir)extra/config/conf -r extra/Configs/Config.in
 
-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
-       $(Q)./extra/config/conf -o extra/Configs/Config.in
+allyesconfig: $(top_builddir)extra/config/conf
+       $(Q)$(top_builddir)extra/config/conf -y extra/Configs/Config.in
+       $(SED) -i -e "s/^DODEBUG=.*/# DODEBUG is not set/" \
+               -e "s/^DOASSERTS=.*/# DOASSERTS is not set/" \
+               -e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" \
+               -e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" \
+               -e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" \
+               $(KCONFIG_CONFIG)
+       $(Q)$(top_builddir)extra/config/conf -o extra/Configs/Config.in
 
-allnoconfig: extra/config/conf
-       $(Q)./extra/config/conf -n extra/Configs/Config.in
+allnoconfig: $(top_builddir)extra/config/conf
+       $(Q)$(top_builddir)extra/config/conf -n extra/Configs/Config.in
 
-defconfig: extra/config/conf
-       $(Q)./extra/config/conf -d extra/Configs/Config.in \
+defconfig: $(top_builddir)extra/config/conf
+       $(Q)$(top_builddir)extra/config/conf -d extra/Configs/Config.in \
                -D extra/Configs/defconfigs/$(ARCH)
 
+menuconfig-clean-y:
+       $(Q)$(MAKE) -C extra/config menuconfig_clean
+
 include_clean:
-       $(Q)$(RM) include/fpu_control.h include/dl-osinfo.h include/hp-timing.h
+       $(Q)$(RM) $(top_builddir)include/fpu_control.h $(top_builddir)include/dl-osinfo.h $(top_builddir)include/hp-timing.h
        @set -e; \
        for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
-               $(RM) include/sys/$$i; \
+               $(RM) $(top_builddir)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) include/sys/$$i; \
+                       $(RM) $(top_builddir)include/sys/$$i; \
                done; \
        fi
 
 clean: include_clean
-       $(Q)$(RM) -r lib include/bits
+       $(Q)$(RM) -r $(top_builddir)lib $(top_builddir)include/bits
        @$(MAKE) -C utils utils_clean
        +$(MAKE) -s -C test clean
-       @$(RM) include/linux include/asm*
+       @$(RM) $(top_builddir)include/linux $(top_builddir)include/asm*
        $(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) {} \;
-       $(RM) .config .config.old .config.cmd
-       $(RM) extra/locale/*.tgz
+       $(RM) $(top_builddir).config $(top_builddir).config.old $(top_builddir).config.cmd
+       $(RM) $(top_builddir)extra/locale/*.tgz
        $(MAKE) -C extra/config distclean
 
 dist release:
        $(RM) -r ../uClibc-$(VERSION) ../uClibc-$(VERSION).tar.bz2
-       svn -q export . ../uClibc-$(VERSION)
+       mkdir -p ../uClibc-$(VERSION)
+       git archive HEAD |(cd  ../uClibc-$(VERSION) && $(TAR) xf -)
        $(TAR) cjf ../uClibc-$(VERSION).tar.bz2 -C .. uClibc-$(VERSION)
        du -b ../uClibc-$(VERSION).tar.bz2