This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
> * Jakub Jelinek wrote on Thu, Apr 29, 2010 at 04:08:51PM CEST: > > Unfortunately this hasn't been resolved on 4.3 and 4.4 branches, This handles no-dist for the 4.3 branch. Tested by bootstrapping the branch and cursory looking that all affected distdir rules were removed. OK to commit? Again, below's the non-generated part, the attachment includes regeneration with Autoconf 2.59 and Automake 1.9.6. Thanks, Ralf Avoid automake distdir rule. libgfortran/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * configure: Regenerate. * Makefile.in: Regenerate. libmudflap/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * config.h.in: Regenerate. * Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. libstdc++-v3/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * configure: Regenerate. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * libmath/Makefile.in: Regenerate. * libsupc++/Makefile.in: Regenerate. * po/Makefile.in: Regenerate. * src/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. libjava/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. libjava/classpath/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. * doc/api/Makefile.in: Regenerate. * examples/Makefile.in: Regenerate. * external/Makefile.in: Regenerate. * external/jsr166/Makefile.in: Regenerate. * external/relaxngDatatype/Makefile.in: Regenerate. * external/sax/Makefile.in: Regenerate. * external/w3c_dom/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * lib/Makefile.in: Regenerate. * native/Makefile.in: Regenerate. * native/fdlibm/Makefile.in: Regenerate. * native/jawt/Makefile.in: Regenerate. * native/jni/Makefile.in: Regenerate. * native/jni/classpath/Makefile.in: Regenerate. * native/jni/gconf-peer/Makefile.in: Regenerate. * native/jni/gstreamer-peer/Makefile.in: Regenerate. * native/jni/gtk-peer/Makefile.in: Regenerate. * native/jni/java-io/Makefile.in: Regenerate. * native/jni/java-lang/Makefile.in: Regenerate. * native/jni/java-net/Makefile.in: Regenerate. * native/jni/java-nio/Makefile.in: Regenerate. * native/jni/java-util/Makefile.in: Regenerate. * native/jni/midi-alsa/Makefile.in: Regenerate. * native/jni/midi-dssi/Makefile.in: Regenerate. * native/jni/native-lib/Makefile.in: Regenerate. * native/jni/qt-peer/Makefile.in: Regenerate. * native/jni/xmlj/Makefile.in: Regenerate. * native/plugin/Makefile.in: Regenerate. * resource/Makefile.in: Regenerate. * scripts/Makefile.in: Regenerate. * tools/Makefile.in: Regenerate. libjava/libltdl/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * Makefile.am (AUTOMAKE_OPTIONS): Add no-dist. * Makefile.in: Regenerate. libgomp/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * configure: Regenerate. * aclocal.m4: Regenerate. * config.h.in: Regenerate. * Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. libffi/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. libssp/ChangeLog: 2010-05-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> PR other/43620 * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. * Makefile.in: Regenerate. * config.h.in: Regenerate. diff --git a/libffi/configure.ac b/libffi/configure.ac index 5d0830b..d2703e5 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -12,7 +12,7 @@ target_alias=${target_alias-$host_alias} . ${srcdir}/configure.host -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([no-dist]) # The same as in boehm-gc and libstdc++. Have to borrow it from there. # We must force CC to /not/ be precious variables; otherwise diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index 5fe3559..6386314 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -60,9 +60,10 @@ target_alias=${target_alias-$host_alias} # we can do about that; they come from AC_INIT). # foreign: we don't follow the normal rules for GNU packages (no COPYING # file in the top srcdir, etc, etc), so stop complaining. +# no-dist: we don't want 'dist' and related rules. # -Wall: turns on all automake warnings... # -Wno-portability: ...except this one, since GNU make is required. -AM_INIT_AUTOMAKE([1.9.6 no-define foreign -Wall -Wno-portability]) +AM_INIT_AUTOMAKE([1.9.6 no-define foreign no-dist -Wall -Wno-portability]) AM_MAINTAINER_MODE AM_ENABLE_MULTILIB(, ..) diff --git a/libgomp/configure.ac b/libgomp/configure.ac index 0cda749..8b7dd80 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -58,10 +58,11 @@ target_alias=${target_alias-$host_alias} # we can do about that; they come from AC_INIT). # foreign: we don't follow the normal rules for GNU packages (no COPYING # file in the top srcdir, etc, etc), so stop complaining. +# no-dist: we don't want 'dist' and related rules. # -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 diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index f75335c..c6e2873 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -72,7 +72,7 @@ CLASSPATH_CONVENIENCE="-no-undefined" AC_SUBST(CLASSPATH_CONVENIENCE) AC_PREREQ(2.59) -AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) +AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar no-dist -Wno-portability]) AC_CONFIG_HEADERS([include/config.h]) AC_PREFIX_DEFAULT(/usr/local/classpath) diff --git a/libjava/configure.ac b/libjava/configure.ac index d32afe5..2990ed5 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -107,7 +107,7 @@ AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(LDFLAGS) -AM_INIT_AUTOMAKE([1.9.0]) +AM_INIT_AUTOMAKE([1.9.0 no-dist]) AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(LD, ld) diff --git a/libjava/libltdl/Makefile.am b/libjava/libltdl/Makefile.am index 737290e..0c2e263 100644 --- a/libjava/libltdl/Makefile.am +++ b/libjava/libltdl/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = no-dependencies foreign +AUTOMAKE_OPTIONS = no-dependencies foreign no-dist ACLOCAL_AMFLAGS = -I ../.. -I ../../config diff --git a/libmudflap/configure.ac b/libmudflap/configure.ac index a22be27..38cbcfe 100644 --- a/libmudflap/configure.ac +++ b/libmudflap/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR(mf-runtime.c) AC_CANONICAL_SYSTEM ACX_NONCANONICAL_TARGET -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([no-dist]) AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE(version-specific-runtime-libs, diff --git a/libssp/configure.ac b/libssp/configure.ac index 99b4edf..d31ea3b 100644 --- a/libssp/configure.ac +++ b/libssp/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR(ssp.c) AC_CANONICAL_SYSTEM ACX_NONCANONICAL_TARGET -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([no-dist]) AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) AC_ARG_ENABLE(version-specific-runtime-libs, diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index bee52cf..295d2f1 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -72,9 +72,10 @@ fi # foreign: we don't follow the normal rules for GNU packages (no COPYING # file in the top srcdir, etc, etc), so stop complaining. # no-dependencies: turns off auto dependency generation (just for now) +# no-dist: we don't want 'dist' and related rules. # -Wall: turns on all automake warnings... # -Wno-portability: ...except this one, since GNU make is now required. -AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dependencies -Wall -Wno-portability -Wno-override]) +AM_INIT_AUTOMAKE([1.9.3 no-define foreign no-dependencies no-dist -Wall -Wno-portability -Wno-override]) AH_TEMPLATE(PACKAGE, [Name of package]) AH_TEMPLATE(VERSION, [Version number of package])
Attachment:
pr-43620-4.3.diff.gz
Description: application/gunzip
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |