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 0d6179a..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 \
@@ -76,12 +76,21 @@ include/bits/uClibc_config.h: .config
        $(INSTALL) -d include/bits
        @./extra/config/conf -o extra/Configs/Config.in
 
-headers: include/bits/uClibc_config.h
+# 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 ($(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 \
@@ -103,16 +112,17 @@ endif
                done; \
        fi
        @cd $(TOPDIR); \
-       set -x -e; \
-       TOPDIR=. CC="$(HOSTCC)" /bin/sh extra/scripts/gen_bits_syscall_h.sh > include/bits/sysnum.h.new; \
+       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
-       touch headers
 
 # Command used to download source code
 WGET:=wget --passive-ftp
@@ -149,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
@@ -207,8 +223,8 @@ endif
        -@for i in `find  $(PREFIX)$(DEVEL_PREFIX) -type d` ; do \
            chmod 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \
        done;
-       -find $(PREFIX)$(DEVEL_PREFIX) -name CVS | xargs $(RM) -r;
-       -chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1.\2/'` $(PREFIX)$(DEVEL_PREFIX)
+       -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)
 ifeq ($(strip $(HAVE_SHARED)),y)
        for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \
        sed -e 's/lib\///'` ; do \
@@ -225,6 +241,10 @@ endif
                $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \
                        | sed -e 's/\.a$$/_pic.a/'`; \
        done;
+       # Ugh!!! Remember that libdl.a and libdl_pic.a are different.  Since
+       # libdl is pretty small, and not likely to benefit from mklibs.py and
+       # similar, lets just remove libdl_pic.a and avoid the issue
+       rm -f $(PREFIX)$(DEVEL_PREFIX)lib/libdl_pic.a
 endif
 
 
@@ -236,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;
@@ -260,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)
 
@@ -317,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
@@ -329,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; \
@@ -354,10 +375,13 @@ release: distclean
        find uClibc-$(VERSION)/ -type f         \
            -name .\#* -exec $(RM) -r {} \; ;   \
        find uClibc-$(VERSION)/ -type d         \
-           -name CVS  -exec $(RM) -r {} \; ;   \
+           -name .svn -exec $(RM) -r {} \; ;   \
                                                \
        tar -cvzf uClibc-$(VERSION).tar.gz uClibc-$(VERSION)/;
 
 endif # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
+check:
+       $(MAKE) -C test
+
 .PHONY: dummy subdirs release distclean clean config oldconfig menuconfig