dont duplicate pthread.h in include and libpthread subdirs, so symlink it

[uclinux-h8/uclibc-ng.git] / Makefile

diff --git a/Makefile b/Makefile
index 5189c98..c69eff8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,9 +42,9 @@ all: headers pregen subdirs shared finished
 
 shared: subdirs
 ifeq ($(strip $(HAVE_SHARED)),y)
-       @echo
-       @echo Building shared libraries ...
-       @echo
+       $(SECHO)
+       $(SECHO) Building shared libraries ...
+       $(SECHO)
        @$(MAKE) -C libc shared
        @$(MAKE) -C ldso shared
        @$(MAKE) -C libcrypt shared
@@ -58,15 +58,15 @@ ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
        @$(MAKE) -C libintl shared
 endif
 else
-       @echo
-       @echo Not building shared libraries ...
-       @echo
+       $(SECHO)
+       $(SECHO) Not building shared libraries ...
+       $(SECHO)
 endif
 
 finished: shared
-       @echo
-       @echo Finally finished compiling ...
-       @echo
+       $(SECHO)
+       $(SECHO) Finally finished compiling ...
+       $(SECHO)
 
 include/bits/uClibc_config.h: .config
        @if [ ! -x ./extra/config/conf ] ; then \
@@ -81,12 +81,16 @@ include/bits/uClibc_config.h: .config
 # in order to generate the headers correctly :(.  That 
 # means we can't use the $(HOSTCC) in order to get the 
 # correct output.
-headers: include/bits/uClibc_config.h
 ifeq ($(strip $(ARCH_HAS_MMU)),y)
-       @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH)
+export header_extra_args = 
 else
-       @set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
+export header_extra_args = -n
 endif
+headers: include/bits/uClibc_config.h
+       @$(SHELL_SET_X); \
+       ./extra/scripts/fix_includes.sh \
+               -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
+               $(header_extra_args)
        @cd include/bits; \
        set -e; \
        for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
@@ -108,13 +112,15 @@ endif
                done; \
        fi
        @cd $(TOPDIR); \
-       set -x -e; \
+       set -e; \
+       $(SHELL_SET_X); \
        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 \
                mv -f include/bits/sysnum.h.new include/bits/sysnum.h; \
        fi
+       $(MAKE) -C libpthread headers
        $(MAKE) -C libc/sysdeps/linux/common headers
        $(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
 
@@ -153,7 +159,13 @@ install_dev:
        $(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);
+       if [ "$(KERNEL_SOURCE)" == "$(DEVEL_PREFIX)" ] ; then \
+               extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \
+       else \
+               extra_exclude="" ; \
+       fi ; \
+       tar -chf - include --exclude .svn --exclude CVS $$extra_exclude \
+               | 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
@@ -212,7 +224,7 @@ endif
            chmod 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \
        done;
        -find $(PREFIX)$(DEVEL_PREFIX) -name .svn | xargs $(RM) -r;
-       -chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1.\2/'` $(PREFIX)$(DEVEL_PREFIX)
+       -chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1:\2/'` $(PREFIX)$(DEVEL_PREFIX)
 ifeq ($(strip $(HAVE_SHARED)),y)
        for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \
        sed -e 's/lib\///'` ; do \
@@ -244,7 +256,8 @@ ifeq ($(strip $(HAVE_SHARED)),y)
                $(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 -x -e; \
+           set -e; \
+               $(SHELL_SET_X); \
            $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
                        $(PREFIX)$(RUNTIME_PREFIX)lib; \
        fi;
@@ -268,9 +281,9 @@ install_utils: utils
 #endif
 
 finished2:
-       @echo
-       @echo Finished installing ...
-       @echo
+       $(SECHO)
+       $(SECHO) Finished installing ...
+       $(SECHO)
 
 else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
@@ -325,7 +338,6 @@ defconfig: extra/config/conf
        $(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
@@ -337,6 +349,7 @@ clean:
        $(MAKE) -C libc/unistd clean
        $(MAKE) -C libc/sysdeps/linux/common clean
        $(MAKE) -C extra/locale clean
+       $(MAKE) -C utils clean
        @set -e; \
        for i in `(cd $(TOPDIR)/libc/sysdeps/linux/common/sys; ls *.h)` ; do \
                $(RM) include/sys/$$i; \
@@ -368,4 +381,7 @@ release: distclean
 
 endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
+check:
+       $(MAKE) -C test
+
 .PHONY: dummy subdirs release distclean clean config oldconfig menuconfig