From 8a1a4544e92e1268314a0f27dd36bd7df5444759 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Wed, 30 Oct 2013 01:09:21 +0100 Subject: [PATCH] gcc_update (files_and_dependencies): Add rules for libcilkrts. 2013-10-29 Tobias Burnus * gcc_update (files_and_dependencies): Add rules for libcilkrts. 2013-10-29 Tobias Burnus * configure.ac: Add AM_MAINTAINER_MODE. * aclocal.m4: Regenerate. * configure.ac: Regenerate. * Makefile.in: Regenerate. From-SVN: r204189 --- contrib/ChangeLog | 5 +++++ contrib/gcc_update | 3 +++ libcilkrts/ChangeLog | 7 +++++++ libcilkrts/Makefile.in | 7 ++++--- libcilkrts/aclocal.m4 | 40 ++++++++++++++++++++++++++++++++++++++++ libcilkrts/configure | 38 ++++++++++++++++++++++++++++++++++++-- libcilkrts/configure.ac | 2 ++ 7 files changed, 97 insertions(+), 5 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index f1fcbca9e0e..029548bf29d 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2013-10-29 Tobias Burnus + + * gcc_update (files_and_dependencies): Add rules for + libcilkrts. + 2013-10-11 Thomas Schwinge * gcc_update (files_and_dependencies): Fix rule for diff --git a/contrib/gcc_update b/contrib/gcc_update index 235c8a9c7af..499e5ef6528 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -161,6 +161,9 @@ libsanitizer/sanitizer_common/Makefile.in: libsanitizer/sanitizer_common/Makefil libvtv/aclocal.m4: libvtv/configure.ac libvtv/acinclude.m4 libvtv/Makefile.in: libvtv/Makefile.am libvtv/aclocal.m4 libvtv/configure: libvtv/configure.ac libvtv/aclocal.m4 +libcilkrts/aclocal.m4: libcilkrts/configure.ac +libcilkrts/Makefile.in: libcilkrts/Makefile.am +libcilkrts/configure: libcilkrts/configure.ac # Top level Makefile.in: Makefile.tpl Makefile.def configure: configure.ac config/acx.m4 diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 884e861b25d..48cc42a1a64 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,10 @@ +2013-10-29 Tobias Burnus + + * configure.ac: Add AM_MAINTAINER_MODE. + * aclocal.m4: Regenerate. + * configure.ac: Regenerate. + * Makefile.in: Regenerate. + 2013-10-23 Balaji V. Iyer * libcilkrts/Makefile.am: New file. Libcilkrts version 3902. diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index ecf8080faf9..46914e4fea5 100644 --- a/libcilkrts/Makefile.in +++ b/libcilkrts/Makefile.in @@ -246,6 +246,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ NM = @NM@ @@ -460,7 +461,7 @@ all: all-am .SUFFIXES: .c .cpp .lo .o .obj am--refresh: @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/include/internal/rev.mk $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/include/internal/rev.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -487,9 +488,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: $(am__configure_deps) +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) diff --git a/libcilkrts/aclocal.m4 b/libcilkrts/aclocal.m4 index 446bedeffa2..68107caffa0 100644 --- a/libcilkrts/aclocal.m4 +++ b/libcilkrts/aclocal.m4 @@ -566,6 +566,46 @@ if test x"${install_sh}" != xset; then fi AC_SUBST(install_sh)]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # Check to see how 'make' treats includes. -*- Autoconf -*- # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. diff --git a/libcilkrts/configure b/libcilkrts/configure index 18fb408e4a7..dc02a86f477 100644 --- a/libcilkrts/configure +++ b/libcilkrts/configure @@ -654,6 +654,9 @@ CPPFLAGS LDFLAGS CXXFLAGS CXX +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -730,6 +733,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_maintainer_mode enable_dependency_tracking enable_multilib enable_version_specific_runtime_libs @@ -1374,6 +1378,8 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-multilib build many library versions (default) @@ -2838,6 +2844,30 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + # Build a DLL on Windows # AC_LIBTOOL_WIN32_DLL ac_ext=cpp @@ -10803,7 +10833,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10806 "configure" +#line 10836 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10909,7 +10939,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10912 "configure" +#line 10942 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14307,6 +14337,10 @@ else am__EXEEXT_FALSE= fi +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/libcilkrts/configure.ac b/libcilkrts/configure.ac index 9acdc11027e..936786816e9 100644 --- a/libcilkrts/configure.ac +++ b/libcilkrts/configure.ac @@ -39,6 +39,8 @@ AC_PREREQ([2.64]) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(foreign no-dist) +AM_MAINTAINER_MODE + # Build a DLL on Windows # AC_LIBTOOL_WIN32_DLL AC_PROG_CXX