]> git.ipfire.org Git - thirdparty/glibc.git/blobdiff - Makefile
Replace FSF snail mail address with URLs.
[thirdparty/glibc.git] / Makefile
index 6a384ade3ce418079c1b585a43886f4cdfbd67da..d1fa3478825957c885da27cff1299503889a9cb6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002,2003,2004,2005,2006,2008,2009
+# Copyright (C) 1991-2002,2003,2004,2005,2006,2008,2009,2011
 #      Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -13,9 +13,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
@@ -33,20 +32,11 @@ 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$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new
 mv -f $@.new $@
-$(autoconf-it-cvs)
 endef
 
 configure: configure.in aclocal.m4; $(autoconf-it)
@@ -63,8 +53,8 @@ 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)
@@ -135,6 +125,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
 
 
@@ -143,8 +153,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 $@
@@ -247,11 +259,11 @@ tests-clean:
 tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out
 ifneq ($(CXX),no)
 check-data := $(firstword $(wildcard \
-               $(foreach D,$(add-ons) scripts,\
-                         $(patsubst %,$D/data/c++-types-%.data,\
-                                    $(abi-name) \
-                                    $(addsuffix -$(config-os),\
-                                                $(config-machine) \
+               $(foreach D,$(add-ons) scripts,\
+                         $(patsubst %,$D/data/c++-types-%.data,\
+                                    $(abi-name) \
+                                    $(addsuffix -$(config-os),\
+                                                $(config-machine) \
                                                 $(base-machine))))))
 ifneq (,$(check-data))
 $(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
@@ -264,7 +276,8 @@ 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 \
@@ -347,51 +360,38 @@ TAGS:
        | $(ETAGS) -o $@ -
 \f
 # Make the distribution tarfile.
-.PHONY: dist tag-for-dist
+.PHONY: dist dist-prepare
 
 generated := $(generated) stubs.h
 
-files-for-dist := README FAQ INSTALL NOTES configure
-
-tag-of-stem = glibc-$(subst .,_,$*)
-dist-selector = -r $(tag-of-stem)
-
-# Add-ons in the main repository but distributed in their own tar files.
-dist-separate = libidn
-
-glibc-%.tar $(dist-separate:%=glibc-%-%.tar): $(files-for-dist) \
-                                             $(foreach D,$(dist-separate),\
-                                                       $D/configure)
-       @rm -fr glibc-$*
-       $(MAKE) -q `find sysdeps $(addsuffix /sysdeps,$(sysdeps-add-ons)) \
-                        -name configure`
-       cvs $(CVSOPTS) -Q export -d glibc-$* $(dist-selector) 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),
-       @rm -fr glibc-$(dir)-$*
-       mv glibc-$*/$(dir) glibc-$(dir)-$*
-       tar cf glibc-$(dir)-$*.tar glibc-$(dir)-$*
-       rm -fr glibc-$(dir)-$*
-)
-endef
+files-for-dist := README FAQ INSTALL NOTES configure ChangeLog NEWS
+
+# 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 $@
@@ -404,9 +404,6 @@ 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/%: FORCE
@@ -421,18 +418,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