Fix formatting in nptl/sysdeps/pthread/pthread.h.
[jlayton/glibc.git] / Makefile
index 3a20a7fc227e4c16f78165afd0712750292efa10..5617acce9e5dec78401e6c3b81e6d43341d2502a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1991-2012 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,8 @@
 # Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #      Master Makefile for the GNU C library
@@ -32,24 +31,16 @@ all: lib others
 \f
 ifneq ($(AUTOCONF),no)
 
-ifeq ($(with-cvs),yes)
-define autoconf-it-cvs
-test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
-endef
-else
-autoconf-it-cvs =
-endif
-
 define autoconf-it
 @-rm -f $@.new
 $(AUTOCONF) $(ACFLAGS) $< > $@.new
-chmod a-w,a+x $@.new
+chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new
 mv -f $@.new $@
-$(autoconf-it-cvs)
 endef
 
 configure: configure.in aclocal.m4; $(autoconf-it)
 %/configure: %/configure.in aclocal.m4; $(autoconf-it)
+%/preconfigure: %/preconfigure.in aclocal.m4; $(autoconf-it)
 
 endif # $(AUTOCONF) = no
 
@@ -61,14 +52,14 @@ endif # $(AUTOCONF) = no
 +subdir_targets        := subdir_lib objects objs others subdir_mostlyclean    \
                   subdir_clean subdir_distclean subdir_realclean       \
                   tests xtests subdir_lint.out                         \
-                  subdir_update-abi subdir_check-abi                   \
-                  subdir_echo-headers                                  \
+                  subdir_update-abi subdir_check-abi                   \
+                  subdir_echo-headers                                  \
                   subdir_install                                       \
                   subdir_objs subdir_stubs subdir_testclean            \
                   $(addprefix install-, no-libc.a bin lib data headers others)
 \f
 headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
-          bits/xopen_lim.h gnu/libc-version.h
+          bits/xopen_lim.h gnu/libc-version.h stdc-predef.h
 
 echo-headers: subdir_echo-headers
 
@@ -120,7 +111,7 @@ install:
 ifneq (no,$(PERL))
 ifeq (/usr,$(prefix))
 ifeq (,$(install_root))
-       CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
+       LD_SO=$(ld.so-version) CC="$(CC)" $(PERL) scripts/test-installation.pl $(common-objpfx)
 endif
 endif
 endif
@@ -133,6 +124,26 @@ lib-noranlib: subdir_lib
 ifeq (yes,$(build-shared))
 # Build the shared object from the PIC object library.
 lib: $(common-objpfx)libc.so
+
+lib: $(common-objpfx)linkobj/libc.so
+
+$(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \
+                                $(common-objpfx)linkobj/libc_pic.a \
+                                $(elfobjdir)/sofini.os \
+                                $(elfobjdir)/interp.os \
+                                $(elfobjdir)/ld.so \
+                                $(shlib-lds)
+       $(build-shlib)
+
+$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \
+                                   $(common-objpfx)sunrpc/librpc_compat_pic.a
+       $(..)./scripts/mkinstalldirs $(common-objpfx)linkobj
+       (cd $(common-objpfx)linkobj; \
+        $(AR) x ../libc_pic.a; \
+        rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \
+        $(AR) x ../sunrpc/librpc_compat_pic.a; \
+        $(AR) cr libc_pic.a *.os; \
+        rm *.os)
 endif
 
 
@@ -141,8 +152,10 @@ endif
 $(common-objpfx)testrun.sh: $(common-objpfx)config.make \
                            $(..)Makeconfig $(..)Makefile
        (echo '#!/bin/sh'; \
-        echo "GCONV_PATH='$(common-objpfx)iconvdata' \\"; \
-        echo 'exec $(run-program-prefix) $${1+"$$@"}'; \
+        echo 'builddir=`dirname "$$0"`'; \
+        echo 'GCONV_PATH="$${builddir}/iconvdata" \'; \
+        echo 'exec $(subst $(common-objdir),"$${builddir}",\
+                           $(run-program-prefix)) $${1+"$$@"}'; \
        ) > $@T
        chmod a+x $@T
        mv -f $@T $@
@@ -157,13 +170,29 @@ others: $(common-objpfx)testrun.sh
 
 subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
 
-ifeq ($(biarch),no)
+ifndef abi-variants
 installed-stubs = $(inst_includedir)/gnu/stubs.h
 else
-installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h
+installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
 
-$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force)
-       $(INSTALL_DATA) $< $@
+$(inst_includedir)/gnu/stubs.h: $(+force)
+       $(make-target-directory)
+       { \
+        echo '/* This file is automatically generated.';\
+        echo "   This file selects the right generated file of \`__stub_FUNCTION' macros";\
+        echo '   based on the architecture being compiled for.  */'; \
+        echo ''; \
+        $(foreach h,$(abi-includes), echo '#include <$(h)>';) \
+        echo ''; \
+        $(foreach v,$(abi-variants),\
+        $(if $(abi-$(v)-condition),\
+        echo '#if $(abi-$(v)-condition)'; \
+        echo '# include <gnu/stubs-$(v).h>'); \
+        $(if $(abi-$(v)-condition),echo '#endif';) \
+        rm -f $(@:.d=.h).new$(v); \
+        ) \
+       } > $(@:.d=.h).new
+       mv -f $(@:.d=.h).new $(@:.d=.h)
 
 install-others-nosubdir: $(installed-stubs)
 endif
@@ -201,7 +230,13 @@ all-subdirs-targets := $(foreach dir,$(subdirs),\
 # The action for each of those is to cd into the directory and make the
 # target there.
 $(all-subdirs-targets):
-       $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
+       $(MAKE) $(PARALLELMFLAGS) $(subdir-target-args) $(@F)
+
+define subdir-target-args
+subdir=$(@D)$(if $($(@D)-srcdir),\
+-C $($(@D)-srcdir) ..=`pwd`/,\
+-C $(@D) ..=../)
+endef
 
 .PHONY: $(+subdir_targets) $(all-subdirs-targets)
 \f
@@ -237,28 +272,23 @@ tests-clean:
 
 tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
 ifneq ($(CXX),no)
-check-data := $(firstword $(wildcard \
-               $(foreach M,$(config-machine) $(base-machine),\
-                         scripts/data/c++-types-$M-$(config-os).data)))
-ifneq (,$(check-data))
-$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
+
+vpath c++-types.data $(+sysdep_dirs)
+
+$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
        scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
-else
-$(objpfx)c++-types-check.out:
-       @echo 'WARNING C++ tests not run; create a c++-types-XXX file'
-       @echo "not run" > $@
-endif
 endif
 
 $(objpfx)check-local-headers.out: scripts/check-local-headers.sh
-       scripts/check-local-headers.sh "$(includedir)" "$(objpfx)" > $@
+       AWK='$(AWK)' scripts/check-local-headers.sh \
+         "$(includedir)" "$(objpfx)" > $@
 
 ifneq ($(PERL),no)
 installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \
                    crypt/crypt.h ctype/ctype.h debug/execinfo.h \
                    dirent/dirent.h dlfcn/dlfcn.h elf/elf.h elf/link.h \
                    gmon/sys/gmon.h gmon/sys/gmon_out.h gmon/sys/profil.h \
-                   grp/grp.h iconv/iconv.h iconv/gconv.h \
+                   grp/grp.h gshadow/gshadow.h iconv/iconv.h iconv/gconv.h \
                    $(wildcard inet/netinet/*.h) \
                    $(wildcard inet/arpa/*.h inet/protocols/*.h) \
                    inet/aliases.h inet/ifaddrs.h inet/netinet/ip6.h \
@@ -324,80 +354,60 @@ ifdef objdir
 endif
        -rm -f $(sysdep-$(distclean-1))
 \f
+# Make the TAGS file for Emacs users.
+
+.PHONY: TAGS
+TAGS:
+       scripts/list-sources.sh | sed -n -e '/Makefile/p' \
+         $(foreach S,[chsSyl] cxx sh bash pl,\
+                   $(subst .,\.,-e '/.$S\(.in\)*$$/p')) \
+       | $(ETAGS) -o $@ -
+\f
 # Make the distribution tarfile.
-.PHONY: dist tag-for-dist
+.PHONY: dist dist-prepare
 
 generated := $(generated) stubs.h
 
-README: README.template version.h
-       -rm -f $@
-       sed -e 's/RELEASE/$(release)/' -e 's/VERSION/$(version)/' < $< > $@
-# Make it unwritable so I won't change it by mistake.
-       chmod 444 $@
-ifeq ($(with-cvs),yes)
-       test ! -d CVS || cvs $(CVSOPTS) commit -m'Remade for $(release)-$(version)' $@
-endif
+files-for-dist := README INSTALL configure ChangeLog NEWS
 
-files-for-dist := README FAQ INSTALL NOTES configure
-
-tag-of-stem = glibc-$(subst .,_,$*)
-
-# Add-ons in the main repository but distributed in their own tar files.
-dist-separate = libidn linuxthreads
-
-# Directories in each add-on.
-dist-separate-libidn = libidn
-dist-separate-linuxthreads = linuxthreads linuxthreads_db
-
-glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \
-                                             $(foreach D,$(dist-separate),\
-                                                       $D/configure)
-       @rm -fr glibc-$*
-       $(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(add-ons)) \
-                        -name configure`
-       cvs $(CVSOPTS) -Q export -d glibc-$* -r $(tag-of-stem) libc
-# Touch all the configure scripts going into the tarball since cvs export
-# might have delivered configure.in newer than configure.
-       find glibc-$* -name configure -print | xargs touch
-       $(dist-do-separate-dirs)
-       tar cf glibc-$*.tar glibc-$*
-       rm -fr glibc-$*
-define dist-do-separate-dirs
-$(foreach dir,$(dist-separate),
-       tar cf glibc-$(dir)-$*.tar -C glibc-$* $(dist-separate-$(dir))
-       rm -rf $(addprefix glibc-$*/,$(dist-separate-$(dir)))
-)
-endef
+# Regenerate stuff, then error if these things are not committed yet.
+dist-prepare: $(files-for-dist)
+       conf=`find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \
+                  -name configure`; \
+       $(MAKE) $$conf && \
+       git diff --stat HEAD -- $^ $$conf \
+       | $(AWK) '{ print; rc=1 } END { exit rc }'
+
+%.tar: FORCE
+       git archive --prefix=$*/ $* > $@.new
+       mv -f $@.new $@
 
 # Do `make dist dist-version=X.Y.Z' to make tar files of an older version.
-dist-version = $(version)
 
-dist: $(foreach Z,.bz2 .gz,glibc-$(dist-version).tar$Z \
-                          $(foreach D,$(dist-separate),\
-                                    glibc-$D-$(dist-version).tar$Z))
+ifneq (,$(strip $(dist-version)))
+dist: $(foreach Z,.bz2 .gz .xz,$(dist-version).tar$Z)
        md5sum $^
-
-tag-for-dist: tag-$(dist-version)
-tag-%: $(files-for-dist)
-       cvs $(CVSOPTS) -Q tag -c $(tag-of-stem)
+else
+dist: dist-prepare
+       @if v=`git describe`; then \
+         echo Distribution version $$v; \
+         $(MAKE) dist dist-version=$$v; \
+       else \
+         false; \
+       fi
+endif
 
 define format-me
 @rm -f $@
-makeinfo --no-validate --no-warn --no-headers $< -o $@
+makeinfo --no-validate --plaintext --no-number-sections $< -o $@
 -chmod a-w $@
 endef
-INSTALL: manual/install.texi; $(format-me)
-NOTES: manual/creature.texi; $(format-me)
+INSTALL: manual/install.texi manual/macros.texi; $(format-me)
 manual/dir-add.texi manual/dir-add.info: FORCE
        $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
-FAQ: scripts/gen-FAQ.pl FAQ.in
-       $(PERL) $^ > $@.new && rm -f $@ && mv $@.new $@ && chmod a-w $@
-ifeq ($(with-cvs),yes)
-       test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated:  $(PERL) $^' $@
-endif
 FORCE:
 
-iconvdata/% localedata/% po/% manual/%:
+iconvdata/% localedata/% po/% manual/%: FORCE
        $(MAKE) $(PARALLELMFLAGS) -C $(@D) $(@F)
 
 # glibc 2.0 contains some header files which aren't used with glibc 2.1
@@ -409,18 +419,18 @@ install: remove-old-headers
 endif
 endif
 
-headers2_0 :=  __math.h bytesex.h confname.h direntry.h elfclass.h     \
-               errnos.h fcntlbits.h huge_val.h ioctl-types.h           \
-               ioctls.h iovec.h jmp_buf.h libc-lock.h local_lim.h      \
-               mathcalls.h mpool.h nan.h ndbm.h posix1_lim.h           \
-               posix2_lim.h posix_opt.h resourcebits.h schedbits.h     \
-               selectbits.h semaphorebits.h sigaction.h sigcontext.h   \
-               signum.h sigset.h sockaddrcom.h socketbits.h stab.def   \
-               statbuf.h statfsbuf.h stdio-lock.h stdio_lim.h          \
-               syscall-list.h termbits.h timebits.h ustatbits.h        \
-               utmpbits.h utsnamelen.h waitflags.h waitstatus.h        \
-               xopen_lim.h gnu/types.h sys/ipc_buf.h                   \
-               sys/kernel_termios.h sys/msq_buf.h sys/sem_buf.h        \
+headers2_0 :=  __math.h bytesex.h confname.h direntry.h elfclass.h     \
+               errnos.h fcntlbits.h huge_val.h ioctl-types.h           \
+               ioctls.h iovec.h jmp_buf.h libc-lock.h local_lim.h      \
+               mathcalls.h mpool.h nan.h ndbm.h posix1_lim.h           \
+               posix2_lim.h posix_opt.h resourcebits.h schedbits.h     \
+               selectbits.h semaphorebits.h sigaction.h sigcontext.h   \
+               signum.h sigset.h sockaddrcom.h socketbits.h stab.def   \
+               statbuf.h statfsbuf.h stdio-lock.h stdio_lim.h          \
+               syscall-list.h termbits.h timebits.h ustatbits.h        \
+               utmpbits.h utsnamelen.h waitflags.h waitstatus.h        \
+               xopen_lim.h gnu/types.h sys/ipc_buf.h                   \
+               sys/kernel_termios.h sys/msq_buf.h sys/sem_buf.h        \
                sys/shm_buf.h sys/socketcall.h sigstack.h
 
 .PHONY: remove-old-headers