OSDN Git Service

(root) / uclinux-h8 / uClibc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
"make utils" now successfully makes utils for target
[uclinux-h8/uClibc.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in
index e843a61..7f03e96 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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.
 #
@@ -20,10 +20,6 @@ sub_headers := headers
 ifeq ($(HAVE_DOT_CONFIG),y)
 
 all: pregen libs
-
-# To be able to build the libs rule, we must first have the generated headers.
-# This is needed when locale support is enabled, but also ensures that the
-# build process is parallel safe.
 libs: pregen
 
 # In this section, we need .config
@@ -61,11 +57,16 @@ ifeq ($(HAVE_DOT_CONFIG),y)
 # 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)
-       @#superfluous: $(Q)$(INSTALL) -d $(dir $@)
        $(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
 # in order to generate the headers correctly :(.  That
@@ -158,7 +159,7 @@ include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh
        @$(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 \
@@ -166,16 +167,25 @@ include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh
        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)/ RUNTIME_PREFIX=./ \
-       DEVEL_PREFIX=$(LOCAL_INSTALL_PATH)/usr/ \
+       $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX=/ \
+       DEVEL_PREFIX=/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
 
@@ -195,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
@@ -204,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
@@ -212,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 \
@@ -275,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.
@@ -296,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
@@ -314,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
@@ -321,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
@@ -350,6 +375,20 @@ 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 all
@@ -409,7 +448,7 @@ 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); \
@@ -427,6 +466,9 @@ utils:
 install_utils: utils
        $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
 
+install_hostutils: hostutils
+       $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install DOTHOST=.host
+
 endif # ifeq ($(HAVE_DOT_CONFIG),y)
 
 include/bits include/config:
@@ -469,14 +511,8 @@ 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) -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; \
@@ -486,9 +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
-       $(RM) -r $(LOCAL_INSTALL_PATH)
+       $(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) {} \;
About OSDN
Find Software
Develop Software
Help