On Thu, Sep 20, 2012 at 3:30 PM, Jakub Jelinek <ja...@redhat.com> wrote:
> Hi!
>
> GCC 4.7.2 upload to ftp.gnu.org has been rejected again similarly to 4.4.4
> upload 2.5 years ago, again on security issues with automake dist/distcheck
> stuff that gcc never uses. From what I remember or can read in the
> archives, we've resolved it at that point by making gcc owned libdirs use
> automake no-dist option on the trunk, regenerating the imported libraries
> with newer automake and for release branches which shouldn't be importing
> external library sources anymore just make everything no-dist.
>
> The following patch is the trunk part, taking care of no-dist for gcc owned
> directories. I've used automake 1.11.1 to avoid bigger changes, the
> problematic lines are all removed even by that versionw ith no-dist.
> Ok for trunk?
Ok.
Thanks,
Richard.
> 2012-09-20 Jakub Jelinek <ja...@redhat.com>
>
> PR other/43620
> libatomic/
> * configure.ac (AM_INIT_AUTOMAKE): Add no-dist.
> * configure: Regenerate.
> * Makefile.in: Regenerate.
> libitm/
> * configure.ac (AM_INIT_AUTOMAKE): Add no-dist.
> * configure: Regenerate.
> * Makefile.in: Regenerate.
>
> --- libatomic/configure.ac.jj 2012-05-08 14:15:52.946811336 +0200
> +++ libatomic/configure.ac 2012-09-20 14:09:06.710071512 +0200
> @@ -76,12 +76,13 @@ target_alias=${target_alias-$host_alias}
> # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch
> # of other PACKAGE_* variables will, however, and there's
> nothing
> # we can do about that; they come from AC_INIT).
> +# no-dist: we don't want 'dist' and related rules.
> # foreign: we don't follow the normal rules for GNU packages (no COPYING
> # file in the top srcdir, etc, etc), so stop complaining.
> # -Wall: turns on all automake warnings...
> # -Wno-portability: ...except this one, since GNU make is required.
> # -Wno-override: ... and this one, since we do want this in testsuite.
> -AM_INIT_AUTOMAKE([1.9.0 foreign -Wall -Wno-portability -Wno-override])
> +AM_INIT_AUTOMAKE([1.9.0 foreign no-dist -Wall -Wno-portability
> -Wno-override])
> AM_ENABLE_MULTILIB(, ..)
>
> # Calculate toolexeclibdir
> --- libatomic/configure.jj 2012-09-17 11:13:20.000000000 +0200
> +++ libatomic/configure 2012-09-20 14:31:42.738332338 +0200
> @@ -2571,6 +2570,7 @@ target_alias=${target_alias-$host_alias}
> # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch
> # of other PACKAGE_* variables will, however, and there's
> nothing
> # we can do about that; they come from AC_INIT).
> +# no-dist: we don't want 'dist' and related rules.
> # foreign: we don't follow the normal rules for GNU packages (no COPYING
> # file in the top srcdir, etc, etc), so stop complaining.
> # -Wall: turns on all automake warnings...
> --- libatomic/Makefile.in.jj 2012-05-08 14:15:52.000000000 +0200
> +++ libatomic/Makefile.in 2012-09-20 14:22:47.671364331 +0200
> @@ -43,12 +43,10 @@ target_triplet = @target@
> @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@am__append_2 = $(addsuffix
> _8_1_.lo,$(SIZEOBJS))
> @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@am__append_3 = $(addsuffix
> _16_1_.lo,$(SIZEOBJS))
> subdir = .
> -DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
> - $(srcdir)/../config.sub $(srcdir)/../depcomp \
> - $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \
> - $(srcdir)/../missing $(srcdir)/../mkinstalldirs \
> - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> - $(srcdir)/auto-config.h.in $(top_srcdir)/configure ChangeLog
> +DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> + $(top_srcdir)/configure $(am__configure_deps) \
> + $(srcdir)/auto-config.h.in $(srcdir)/../mkinstalldirs \
> + $(srcdir)/../depcomp
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
> $(top_srcdir)/../config/depstand.m4 \
> @@ -110,7 +108,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
> --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
> $(LDFLAGS) -o $@
> SOURCES = $(libatomic_la_SOURCES) $(EXTRA_libatomic_la_SOURCES)
> -DIST_SOURCES = $(libatomic_la_SOURCES) $(EXTRA_libatomic_la_SOURCES)
> MULTISRCTOP =
> MULTIBUILDTOP =
> MULTIDIRS =
> @@ -127,47 +124,10 @@ RECURSIVE_TARGETS = all-recursive check-
> RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
> distclean-recursive maintainer-clean-recursive
> AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
> - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
> - distdir dist dist-all distcheck
> + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
> ETAGS = etags
> CTAGS = ctags
> DIST_SUBDIRS = $(SUBDIRS)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> -distdir = $(PACKAGE)-$(VERSION)
> -top_distdir = $(distdir)
> -am__remove_distdir = \
> - { test ! -d "$(distdir)" \
> - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
> - && rm -fr "$(distdir)"; }; }
> -am__relativize = \
> - dir0=`pwd`; \
> - sed_first='s,^\([^/]*\)/.*$$,\1,'; \
> - sed_rest='s,^[^/]*/*,,'; \
> - sed_last='s,^.*/\([^/]*\)$$,\1,'; \
> - sed_butlast='s,/*[^/]*$$,,'; \
> - while test -n "$$dir1"; do \
> - first=`echo "$$dir1" | sed -e "$$sed_first"`; \
> - if test "$$first" != "."; then \
> - if test "$$first" = ".."; then \
> - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
> - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
> - else \
> - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
> - if test "$$first2" = "$$first"; then \
> - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
> - else \
> - dir2="../$$dir2"; \
> - fi; \
> - dir0="$$dir0"/"$$first"; \
> - fi; \
> - fi; \
> - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
> - done; \
> - reldir="$$dir2"
> -DIST_ARCHIVES = $(distdir).tar.gz
> -GZIP_ENV = --best
> -distuninstallcheck_listfiles = find . -type f -print
> -distcleancheck_listfiles = find . -type f -print
> ACLOCAL = @ACLOCAL@
> AMTAR = @AMTAR@
> AR = @AR@
> @@ -633,182 +593,6 @@ GTAGS:
>
> distclean-tags:
> -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> - $(am__remove_distdir)
> - test -d "$(distdir)" || mkdir "$(distdir)"
> - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> - list='$(DISTFILES)'; \
> - dist_files=`for file in $$list; do echo $$file; done | \
> - sed -e "s|^$$srcdirstrip/||;t" \
> - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> - case $$dist_files in \
> - */*) $(MKDIR_P) `echo "$$dist_files" | \
> - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> - sort -u` ;; \
> - esac; \
> - for file in $$dist_files; do \
> - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir);
> fi; \
> - if test -d $$d/$$file; then \
> - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> - if test -d "$(distdir)/$$file"; then \
> - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
> {} \;; \
> - fi; \
> - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
> {} \;; \
> - fi; \
> - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> - else \
> - test -f "$(distdir)/$$file" \
> - || cp -p $$d/$$file "$(distdir)/$$file" \
> - || exit 1; \
> - fi; \
> - done
> - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> - if test "$$subdir" = .; then :; else \
> - test -d "$(distdir)/$$subdir" \
> - || $(MKDIR_P) "$(distdir)/$$subdir" \
> - || exit 1; \
> - fi; \
> - done
> - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> - if test "$$subdir" = .; then :; else \
> - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> - $(am__relativize); \
> - new_distdir=$$reldir; \
> - dir1=$$subdir; dir2="$(top_distdir)"; \
> - $(am__relativize); \
> - new_top_distdir=$$reldir; \
> - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
> top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> - echo " am__remove_distdir=: am__skip_length_check=:
> am__skip_mode_fix=: distdir)"; \
> - ($(am__cd) $$subdir && \
> - $(MAKE) $(AM_MAKEFLAGS) \
> - top_distdir="$$new_top_distdir" \
> - distdir="$$new_distdir" \
> - am__remove_distdir=: \
> - am__skip_length_check=: \
> - am__skip_mode_fix=: \
> - distdir) \
> - || exit 1; \
> - fi; \
> - done
> - -test -n "$(am__skip_mode_fix)" \
> - || find "$(distdir)" -type d ! -perm -755 \
> - -exec chmod u+rwx,go+rx {} \; -o \
> - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
> - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
> - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
> - || chmod -R a+r "$(distdir)"
> -dist-gzip: distdir
> - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
> >$(distdir).tar.gz
> - $(am__remove_distdir)
> -
> -dist-bzip2: distdir
> - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
> - $(am__remove_distdir)
> -
> -dist-lzma: distdir
> - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
> - $(am__remove_distdir)
> -
> -dist-xz: distdir
> - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
> - $(am__remove_distdir)
> -
> -dist-tarZ: distdir
> - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
> - $(am__remove_distdir)
> -
> -dist-shar: distdir
> - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
> - $(am__remove_distdir)
> -
> -dist-zip: distdir
> - -rm -f $(distdir).zip
> - zip -rq $(distdir).zip $(distdir)
> - $(am__remove_distdir)
> -
> -dist dist-all: distdir
> - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
> >$(distdir).tar.gz
> - $(am__remove_distdir)
> -
> -# This target untars the dist file and tries a VPATH configuration. Then
> -# it guarantees that the distribution is self-contained by making another
> -# tarfile.
> -distcheck: dist
> - case '$(DIST_ARCHIVES)' in \
> - *.tar.gz*) \
> - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
> - *.tar.bz2*) \
> - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
> - *.tar.lzma*) \
> - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
> - *.tar.xz*) \
> - xz -dc $(distdir).tar.xz | $(am__untar) ;;\
> - *.tar.Z*) \
> - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
> - *.shar.gz*) \
> - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
> - *.zip*) \
> - unzip $(distdir).zip ;;\
> - esac
> - chmod -R a-w $(distdir); chmod a+w $(distdir)
> - mkdir $(distdir)/_build
> - mkdir $(distdir)/_inst
> - chmod a-w $(distdir)
> - test -d $(distdir)/_build || exit 0; \
> - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e
> 's,^[^:\\/]:[\\/],/,'` \
> - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
> - && am__cwd=`pwd` \
> - && $(am__cd) $(distdir)/_build \
> - && ../configure --srcdir=.. --prefix="$$dc_install_base" \
> - $(DISTCHECK_CONFIGURE_FLAGS) \
> - && $(MAKE) $(AM_MAKEFLAGS) \
> - && $(MAKE) $(AM_MAKEFLAGS) dvi \
> - && $(MAKE) $(AM_MAKEFLAGS) check \
> - && $(MAKE) $(AM_MAKEFLAGS) install \
> - && $(MAKE) $(AM_MAKEFLAGS) installcheck \
> - && $(MAKE) $(AM_MAKEFLAGS) uninstall \
> - && $(MAKE) $(AM_MAKEFLAGS)
> distuninstallcheck_dir="$$dc_install_base" \
> - distuninstallcheck \
> - && chmod -R a-w "$$dc_install_base" \
> - && ({ \
> - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
> - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
> - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
> - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
> - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck;
> \
> - } || { rm -rf "$$dc_destdir"; exit 1; }) \
> - && rm -rf "$$dc_destdir" \
> - && $(MAKE) $(AM_MAKEFLAGS) dist \
> - && rm -rf $(DIST_ARCHIVES) \
> - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
> - && cd "$$am__cwd" \
> - || exit 1
> - $(am__remove_distdir)
> - @(echo "$(distdir) archives ready for distribution: "; \
> - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
> - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
> -distuninstallcheck:
> - @$(am__cd) '$(distuninstallcheck_dir)' \
> - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
> - || { echo "ERROR: files left after uninstall:" ; \
> - if test -n "$(DESTDIR)"; then \
> - echo " (check DESTDIR support)"; \
> - fi ; \
> - $(distuninstallcheck_listfiles) ; \
> - exit 1; } >&2
> -distcleancheck: distclean
> - @if test '$(srcdir)' = . ; then \
> - echo "ERROR: distcleancheck can only run from a VPATH build" ; \
> - exit 1 ; \
> - fi
> - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
> - || { echo "ERROR: files left in build directory after distclean:" ;
> \
> - $(distcleancheck_listfiles) ; \
> - exit 1; } >&2
> check-am: all-am
> check: check-recursive
> all-am: Makefile $(LTLIBRARIES) all-multi auto-config.h
> @@ -924,23 +708,20 @@ uninstall-am: uninstall-toolexeclibLTLIB
> .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
> all all-am all-multi am--refresh check check-am clean \
> clean-generic clean-libtool clean-multi \
> - clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist \
> - dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
> - dist-xz dist-zip distcheck distclean distclean-compile \
> - distclean-generic distclean-hdr distclean-libtool \
> - distclean-multi distclean-tags distcleancheck distdir \
> - distuninstallcheck dvi dvi-am html html-am info info-am \
> - install install-am install-data install-data-am install-dvi \
> - install-dvi-am install-exec install-exec-am install-html \
> - install-html-am install-info install-info-am install-man \
> - install-multi install-pdf install-pdf-am install-ps \
> - install-ps-am install-strip install-toolexeclibLTLIBRARIES \
> - installcheck installcheck-am installdirs installdirs-am \
> - maintainer-clean maintainer-clean-generic \
> - maintainer-clean-multi mostlyclean mostlyclean-compile \
> - mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \
> - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
> - uninstall-toolexeclibLTLIBRARIES
> + clean-toolexeclibLTLIBRARIES ctags ctags-recursive distclean \
> + distclean-compile distclean-generic distclean-hdr \
> + distclean-libtool distclean-multi distclean-tags dvi dvi-am \
> + html html-am info info-am install install-am install-data \
> + install-data-am install-dvi install-dvi-am install-exec \
> + install-exec-am install-html install-html-am install-info \
> + install-info-am install-man install-multi install-pdf \
> + install-pdf-am install-ps install-ps-am install-strip \
> + install-toolexeclibLTLIBRARIES installcheck installcheck-am \
> + installdirs installdirs-am maintainer-clean \
> + maintainer-clean-generic maintainer-clean-multi mostlyclean \
> + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
> + mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \
> + uninstall uninstall-am uninstall-toolexeclibLTLIBRARIES
>
>
> vpath % $(strip $(search_path))
> --- libitm/configure.ac.jj 2012-02-15 07:35:00.042370648 +0100
> +++ libitm/configure.ac 2012-09-20 14:09:34.193910435 +0200
> @@ -70,12 +70,13 @@ target_alias=${target_alias-$host_alias}
> # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch
> # of other PACKAGE_* variables will, however, and there's
> nothing
> # we can do about that; they come from AC_INIT).
> +# no-dist: we don't want 'dist' and related rules.
> # foreign: we don't follow the normal rules for GNU packages (no COPYING
> # file in the top srcdir, etc, etc), so stop complaining.
> # -Wall: turns on all automake warnings...
> # -Wno-portability: ...except this one, since GNU make is required.
> # -Wno-override: ... and this one, since we do want this in testsuite.
> -AM_INIT_AUTOMAKE([1.9.0 foreign -Wall -Wno-portability -Wno-override])
> +AM_INIT_AUTOMAKE([1.9.0 foreign no-dist -Wall -Wno-portability
> -Wno-override])
> AM_ENABLE_MULTILIB(, ..)
>
> # Calculate toolexeclibdir
> --- libitm/configure.jj 2012-09-17 11:13:15.000000000 +0200
> +++ libitm/configure 2012-09-20 14:31:07.841530802 +0200
> @@ -2844,6 +2844,7 @@ target_alias=${target_alias-$host_alias}
> # no-define: PACKAGE and VERSION will not be #define'd in config.h (a bunch
> # of other PACKAGE_* variables will, however, and there's
> nothing
> # we can do about that; they come from AC_INIT).
> +# no-dist: we don't want 'dist' and related rules.
> # foreign: we don't follow the normal rules for GNU packages (no COPYING
> # file in the top srcdir, etc, etc), so stop complaining.
> # -Wall: turns on all automake warnings...
> @@ -11778,7 +11779,7 @@ else
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 11781 "configure"
> +#line 11782 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> @@ -11884,7 +11885,7 @@ else
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 11887 "configure"
> +#line 11888 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> --- libitm/Makefile.in.jj 2012-02-15 07:35:00.000000000 +0100
> +++ libitm/Makefile.in 2012-09-20 14:25:53.224316143 +0200
> @@ -40,13 +40,10 @@ target_triplet = @target@
> @ARCH_X86_TRUE@am__append_2 = x86_sse.cc x86_avx.cc
> @ARCH_FUTEX_TRUE@am__append_3 = futex.cc
> subdir = .
> -DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \
> - $(srcdir)/../config.sub $(srcdir)/../depcomp \
> - $(srcdir)/../install-sh $(srcdir)/../ltmain.sh \
> - $(srcdir)/../missing $(srcdir)/../mkinstalldirs \
> - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
> - $(srcdir)/config.h.in $(srcdir)/libitm.spec.in \
> - $(top_srcdir)/configure ChangeLog
> +DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
> + $(top_srcdir)/configure $(am__configure_deps) \
> + $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
> + $(srcdir)/libitm.spec.in $(srcdir)/../depcomp
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
> am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
> $(top_srcdir)/../config/asmcfi.m4 \
> @@ -97,11 +94,6 @@ am__installdirs = "$(DESTDIR)$(toolexecl
> "$(DESTDIR)$(toolexeclibdir)"
> LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
> libitm_la_LIBADD =
> -am__libitm_la_SOURCES_DIST = aatree.cc alloc.cc alloc_c.cc \
> - alloc_cpp.cc barrier.cc beginend.cc clone.cc eh_cpp.cc \
> - local.cc query.cc retry.cc rwlock.cc useraction.cc util.cc \
> - sjlj.S tls.cc method-serial.cc method-gl.cc method-ml.cc \
> - hwcap.cc x86_sse.cc x86_avx.cc futex.cc
> @ARCH_ARM_TRUE@am__objects_1 = hwcap.lo
> @ARCH_X86_TRUE@am__objects_2 = x86_sse.lo x86_avx.lo
> @ARCH_FUTEX_TRUE@am__objects_3 = futex.lo
> @@ -139,7 +131,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
> --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
> $(LDFLAGS) -o $@
> SOURCES = $(libitm_la_SOURCES)
> -DIST_SOURCES = $(am__libitm_la_SOURCES_DIST)
> MULTISRCTOP =
> MULTIBUILDTOP =
> MULTIDIRS =
> @@ -169,47 +160,10 @@ HEADERS = $(nodist_toolexeclib_HEADERS)
> RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
> distclean-recursive maintainer-clean-recursive
> AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
> - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
> - distdir dist dist-all distcheck
> + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS
> ETAGS = etags
> CTAGS = ctags
> DIST_SUBDIRS = $(SUBDIRS)
> -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
> -distdir = $(PACKAGE)-$(VERSION)
> -top_distdir = $(distdir)
> -am__remove_distdir = \
> - { test ! -d "$(distdir)" \
> - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
> - && rm -fr "$(distdir)"; }; }
> -am__relativize = \
> - dir0=`pwd`; \
> - sed_first='s,^\([^/]*\)/.*$$,\1,'; \
> - sed_rest='s,^[^/]*/*,,'; \
> - sed_last='s,^.*/\([^/]*\)$$,\1,'; \
> - sed_butlast='s,/*[^/]*$$,,'; \
> - while test -n "$$dir1"; do \
> - first=`echo "$$dir1" | sed -e "$$sed_first"`; \
> - if test "$$first" != "."; then \
> - if test "$$first" = ".."; then \
> - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
> - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
> - else \
> - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
> - if test "$$first2" = "$$first"; then \
> - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
> - else \
> - dir2="../$$dir2"; \
> - fi; \
> - dir0="$$dir0"/"$$first"; \
> - fi; \
> - fi; \
> - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
> - done; \
> - reldir="$$dir2"
> -DIST_ARCHIVES = $(distdir).tar.gz
> -GZIP_ENV = --best
> -distuninstallcheck_listfiles = find . -type f -print
> -distcleancheck_listfiles = find . -type f -print
> ACLOCAL = @ACLOCAL@
> AMTAR = @AMTAR@
> AR = @AR@
> @@ -867,185 +821,6 @@ GTAGS:
>
> distclean-tags:
> -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
> -
> -distdir: $(DISTFILES)
> - $(am__remove_distdir)
> - test -d "$(distdir)" || mkdir "$(distdir)"
> - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> - list='$(DISTFILES)'; \
> - dist_files=`for file in $$list; do echo $$file; done | \
> - sed -e "s|^$$srcdirstrip/||;t" \
> - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
> - case $$dist_files in \
> - */*) $(MKDIR_P) `echo "$$dist_files" | \
> - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
> - sort -u` ;; \
> - esac; \
> - for file in $$dist_files; do \
> - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir);
> fi; \
> - if test -d $$d/$$file; then \
> - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
> - if test -d "$(distdir)/$$file"; then \
> - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
> {} \;; \
> - fi; \
> - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
> {} \;; \
> - fi; \
> - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
> - else \
> - test -f "$(distdir)/$$file" \
> - || cp -p $$d/$$file "$(distdir)/$$file" \
> - || exit 1; \
> - fi; \
> - done
> - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> - if test "$$subdir" = .; then :; else \
> - test -d "$(distdir)/$$subdir" \
> - || $(MKDIR_P) "$(distdir)/$$subdir" \
> - || exit 1; \
> - fi; \
> - done
> - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
> - if test "$$subdir" = .; then :; else \
> - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
> - $(am__relativize); \
> - new_distdir=$$reldir; \
> - dir1=$$subdir; dir2="$(top_distdir)"; \
> - $(am__relativize); \
> - new_top_distdir=$$reldir; \
> - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
> top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
> - echo " am__remove_distdir=: am__skip_length_check=:
> am__skip_mode_fix=: distdir)"; \
> - ($(am__cd) $$subdir && \
> - $(MAKE) $(AM_MAKEFLAGS) \
> - top_distdir="$$new_top_distdir" \
> - distdir="$$new_distdir" \
> - am__remove_distdir=: \
> - am__skip_length_check=: \
> - am__skip_mode_fix=: \
> - distdir) \
> - || exit 1; \
> - fi; \
> - done
> - $(MAKE) $(AM_MAKEFLAGS) \
> - top_distdir="$(top_distdir)" distdir="$(distdir)" \
> - dist-info
> - -test -n "$(am__skip_mode_fix)" \
> - || find "$(distdir)" -type d ! -perm -755 \
> - -exec chmod u+rwx,go+rx {} \; -o \
> - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
> - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
> - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
> - || chmod -R a+r "$(distdir)"
> -dist-gzip: distdir
> - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
> >$(distdir).tar.gz
> - $(am__remove_distdir)
> -
> -dist-bzip2: distdir
> - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
> - $(am__remove_distdir)
> -
> -dist-lzma: distdir
> - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
> - $(am__remove_distdir)
> -
> -dist-xz: distdir
> - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
> - $(am__remove_distdir)
> -
> -dist-tarZ: distdir
> - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
> - $(am__remove_distdir)
> -
> -dist-shar: distdir
> - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
> - $(am__remove_distdir)
> -
> -dist-zip: distdir
> - -rm -f $(distdir).zip
> - zip -rq $(distdir).zip $(distdir)
> - $(am__remove_distdir)
> -
> -dist dist-all: distdir
> - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
> >$(distdir).tar.gz
> - $(am__remove_distdir)
> -
> -# This target untars the dist file and tries a VPATH configuration. Then
> -# it guarantees that the distribution is self-contained by making another
> -# tarfile.
> -distcheck: dist
> - case '$(DIST_ARCHIVES)' in \
> - *.tar.gz*) \
> - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
> - *.tar.bz2*) \
> - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
> - *.tar.lzma*) \
> - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
> - *.tar.xz*) \
> - xz -dc $(distdir).tar.xz | $(am__untar) ;;\
> - *.tar.Z*) \
> - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
> - *.shar.gz*) \
> - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
> - *.zip*) \
> - unzip $(distdir).zip ;;\
> - esac
> - chmod -R a-w $(distdir); chmod a+w $(distdir)
> - mkdir $(distdir)/_build
> - mkdir $(distdir)/_inst
> - chmod a-w $(distdir)
> - test -d $(distdir)/_build || exit 0; \
> - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e
> 's,^[^:\\/]:[\\/],/,'` \
> - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
> - && am__cwd=`pwd` \
> - && $(am__cd) $(distdir)/_build \
> - && ../configure --srcdir=.. --prefix="$$dc_install_base" \
> - $(DISTCHECK_CONFIGURE_FLAGS) \
> - && $(MAKE) $(AM_MAKEFLAGS) \
> - && $(MAKE) $(AM_MAKEFLAGS) dvi \
> - && $(MAKE) $(AM_MAKEFLAGS) check \
> - && $(MAKE) $(AM_MAKEFLAGS) install \
> - && $(MAKE) $(AM_MAKEFLAGS) installcheck \
> - && $(MAKE) $(AM_MAKEFLAGS) uninstall \
> - && $(MAKE) $(AM_MAKEFLAGS)
> distuninstallcheck_dir="$$dc_install_base" \
> - distuninstallcheck \
> - && chmod -R a-w "$$dc_install_base" \
> - && ({ \
> - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
> - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
> - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
> - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
> - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck;
> \
> - } || { rm -rf "$$dc_destdir"; exit 1; }) \
> - && rm -rf "$$dc_destdir" \
> - && $(MAKE) $(AM_MAKEFLAGS) dist \
> - && rm -rf $(DIST_ARCHIVES) \
> - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
> - && cd "$$am__cwd" \
> - || exit 1
> - $(am__remove_distdir)
> - @(echo "$(distdir) archives ready for distribution: "; \
> - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
> - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
> -distuninstallcheck:
> - @$(am__cd) '$(distuninstallcheck_dir)' \
> - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
> - || { echo "ERROR: files left after uninstall:" ; \
> - if test -n "$(DESTDIR)"; then \
> - echo " (check DESTDIR support)"; \
> - fi ; \
> - $(distuninstallcheck_listfiles) ; \
> - exit 1; } >&2
> -distcleancheck: distclean
> - @if test '$(srcdir)' = . ; then \
> - echo "ERROR: distcleancheck can only run from a VPATH build" ; \
> - exit 1 ; \
> - fi
> - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
> - || { echo "ERROR: files left in build directory after distclean:" ;
> \
> - $(distcleancheck_listfiles) ; \
> - exit 1; } >&2
> check-am: all-am
> check: check-recursive
> all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) all-multi $(HEADERS) \
> @@ -1244,13 +1019,10 @@ uninstall-am: uninstall-dvi-am uninstall
> .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
> all all-am all-local all-multi am--refresh check check-am \
> clean clean-aminfo clean-generic clean-libtool clean-multi \
> - clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist \
> - dist-all dist-bzip2 dist-gzip dist-info dist-lzma dist-shar \
> - dist-tarZ dist-xz dist-zip distcheck distclean \
> - distclean-compile distclean-generic distclean-hdr \
> - distclean-libtool distclean-multi distclean-tags \
> - distcleancheck distdir distuninstallcheck dvi dvi-am html \
> - html-am info info-am install install-am install-data \
> + clean-toolexeclibLTLIBRARIES ctags ctags-recursive dist-info \
> + distclean distclean-compile distclean-generic distclean-hdr \
> + distclean-libtool distclean-multi distclean-tags dvi dvi-am \
> + html html-am info info-am install install-am install-data \
> install-data-am install-dvi install-dvi-am install-exec \
> install-exec-am install-html install-html-am install-info \
> install-info-am install-man install-multi \
>
> Jakub
