diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-05 23:09:00 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2015-01-05 23:09:00 +0100 |
commit | 420e5f1423ab2979ca291361e18795a6381b8fa5 (patch) | |
tree | 53722da8f7283cc0a1ff268ce97a9dff94b6a69c /m4 | |
parent | b768a17c30e94f5cb8d854a6cbb2eb54c3bc80ed (diff) | |
parent | 46ce39e1a24f3016db3bc6cf857977be7a1cda1b (diff) | |
download | automake-420e5f1423ab2979ca291361e18795a6381b8fa5.tar.gz |
Merge branch 'master' into ng/master
* master:
maint: update copyright years to 2015 (branch 'master')
maint: update copyright years to 2015 (branch 'micro')
Diffstat (limited to 'm4')
-rw-r--r-- | m4/Makefile.inc | 2 | ||||
-rw-r--r-- | m4/amversion.in | 2 | ||||
-rw-r--r-- | m4/amversion.m4 | 2 | ||||
-rw-r--r-- | m4/ar-lib.m4 | 2 | ||||
-rw-r--r-- | m4/as.m4 | 2 | ||||
-rw-r--r-- | m4/auxdir.m4 | 2 | ||||
-rw-r--r-- | m4/cond-if.m4 | 2 | ||||
-rw-r--r-- | m4/cond.m4 | 2 | ||||
-rw-r--r-- | m4/depend.m4 | 2 | ||||
-rw-r--r-- | m4/dmalloc.m4 | 2 | ||||
-rw-r--r-- | m4/extra-recurs.m4 | 2 | ||||
-rw-r--r-- | m4/gcj.m4 | 2 | ||||
-rw-r--r-- | m4/init.m4 | 2 | ||||
-rw-r--r-- | m4/install-sh.m4 | 2 | ||||
-rw-r--r-- | m4/internal/ac-config-macro-dirs.m4 | 2 | ||||
-rw-r--r-- | m4/lex.m4 | 2 | ||||
-rw-r--r-- | m4/lispdir.m4 | 2 | ||||
-rw-r--r-- | m4/missing.m4 | 2 | ||||
-rw-r--r-- | m4/obsolete.m4 | 2 | ||||
-rw-r--r-- | m4/options.m4 | 2 | ||||
-rw-r--r-- | m4/prog-cc-c-o.m4 | 2 | ||||
-rw-r--r-- | m4/python.m4 | 2 | ||||
-rw-r--r-- | m4/runlog.m4 | 2 | ||||
-rw-r--r-- | m4/sanity.m4 | 2 | ||||
-rw-r--r-- | m4/silent.m4 | 2 | ||||
-rw-r--r-- | m4/strip.m4 | 2 | ||||
-rw-r--r-- | m4/substnot.m4 | 2 | ||||
-rw-r--r-- | m4/tar.m4 | 2 | ||||
-rw-r--r-- | m4/upc.m4 | 2 | ||||
-rw-r--r-- | m4/vala.m4 | 2 |
30 files changed, 30 insertions, 30 deletions
diff --git a/m4/Makefile.inc b/m4/Makefile.inc index 620a19684..64f79350d 100644 --- a/m4/Makefile.inc +++ b/m4/Makefile.inc @@ -1,6 +1,6 @@ ## Included by top-level Makefile for Automake. -## Copyright (C) 1995-2014 Free Software Foundation, Inc. +## Copyright (C) 1995-2015 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/m4/amversion.in b/m4/amversion.in index 38a198eee..6d6a47c48 100644 --- a/m4/amversion.in +++ b/m4/amversion.in @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## @configure_input@ -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/amversion.m4 b/m4/amversion.m4 index c127a5567..d7d7e5cb3 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## Generated from amversion.in; do not edit by hand. -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/ar-lib.m4 b/m4/ar-lib.m4 index 7751bf71a..914b21bc2 100644 --- a/m4/ar-lib.m4 +++ b/m4/ar-lib.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/auxdir.m4 b/m4/auxdir.m4 index 93fc22521..fd0e060bb 100644 --- a/m4/auxdir.m4 +++ b/m4/auxdir.m4 @@ -1,6 +1,6 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/cond-if.m4 b/m4/cond-if.m4 index afe83965c..1639cdff4 100644 --- a/m4/cond-if.m4 +++ b/m4/cond-if.m4 @@ -1,6 +1,6 @@ # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/cond.m4 b/m4/cond.m4 index e9138865e..e3c04e99c 100644 --- a/m4/cond.m4 +++ b/m4/cond.m4 @@ -1,6 +1,6 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/depend.m4 b/m4/depend.m4 index 28daec04c..9ed708a73 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4 index e39216b9d..b94124639 100644 --- a/m4/dmalloc.m4 +++ b/m4/dmalloc.m4 @@ -3,7 +3,7 @@ ## From Franc,ois Pinard ## ## ----------------------------------- ## -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/extra-recurs.m4 b/m4/extra-recurs.m4 index 9f7313137..64506b588 100644 --- a/m4/extra-recurs.m4 +++ b/m4/extra-recurs.m4 @@ -1,6 +1,6 @@ # AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*- -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,7 +1,7 @@ # Check for Java compiler. -*- Autoconf -*- # For now we only handle the GNU compiler. -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/init.m4 b/m4/init.m4 index 4a00a90dc..79a6d4a73 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -1,6 +1,6 @@ # Do all the work for Automake-NG. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/install-sh.m4 b/m4/install-sh.m4 index 16a3d9c33..411a9a23a 100644 --- a/m4/install-sh.m4 +++ b/m4/install-sh.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/internal/ac-config-macro-dirs.m4 b/m4/internal/ac-config-macro-dirs.m4 index 65be26e8f..c62f506ef 100644 --- a/m4/internal/ac-config-macro-dirs.m4 +++ b/m4/internal/ac-config-macro-dirs.m4 @@ -4,7 +4,7 @@ # FIXME: keep in sync with the contents of the variable # '$ac_config_macro_dirs_fallback' in aclocal.in. -# Copyright (C) 2012-2014 Free Software Foundation, Inc. +# Copyright (C) 2012-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ ## Replacement for AC_PROG_LEX. -*- Autoconf -*- ## by Alexandre Oliva <oliva@dcc.unicamp.br> -# Copyright (C) 1998-2014 Free Software Foundation, Inc. +# Copyright (C) 1998-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/lispdir.m4 b/m4/lispdir.m4 index f1f2212f1..1d5e1e98a 100644 --- a/m4/lispdir.m4 +++ b/m4/lispdir.m4 @@ -3,7 +3,7 @@ ## From Ulrich Drepper ## Almost entirely rewritten by Alexandre Oliva ## ------------------------ -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/missing.m4 b/m4/missing.m4 index c80b39cfb..abc985f98 100644 --- a/m4/missing.m4 +++ b/m4/missing.m4 @@ -1,6 +1,6 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/obsolete.m4 b/m4/obsolete.m4 index 9579f820a..f6d5a6111 100644 --- a/m4/obsolete.m4 +++ b/m4/obsolete.m4 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Deprecated, obsolescent or and obsolete macros. # -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/options.m4 b/m4/options.m4 index c2e29907e..ada0bc7d3 100644 --- a/m4/options.m4 +++ b/m4/options.m4 @@ -1,6 +1,6 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/prog-cc-c-o.m4 b/m4/prog-cc-c-o.m4 index e3ae542fe..afacb62bd 100644 --- a/m4/prog-cc-c-o.m4 +++ b/m4/prog-cc-c-o.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/python.m4 b/m4/python.m4 index 5b2c695c0..32c30e299 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -3,7 +3,7 @@ ## From Andrew Dalke ## Updated by James Henstridge ## ------------------------ -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/runlog.m4 b/m4/runlog.m4 index b09a53818..ed01ec623 100644 --- a/m4/runlog.m4 +++ b/m4/runlog.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/sanity.m4 b/m4/sanity.m4 index e89f15a89..a209693fe 100644 --- a/m4/sanity.m4 +++ b/m4/sanity.m4 @@ -1,6 +1,6 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/silent.m4 b/m4/silent.m4 index a8d1b978d..795797d25 100644 --- a/m4/silent.m4 +++ b/m4/silent.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/strip.m4 b/m4/strip.m4 index 4a588f12f..1300877ee 100644 --- a/m4/strip.m4 +++ b/m4/strip.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/substnot.m4 b/m4/substnot.m4 index 72ee7ddd1..dc504fe68 100644 --- a/m4/substnot.m4 +++ b/m4/substnot.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1,6 +1,6 @@ # Find a compiler for Unified Parallel C. -*- Autoconf -*- -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/vala.m4 b/m4/vala.m4 index 00d1b72ca..f3eeeef39 100644 --- a/m4/vala.m4 +++ b/m4/vala.m4 @@ -1,6 +1,6 @@ # Autoconf support for the Vala compiler -# Copyright (C) 2008-2014 Free Software Foundation, Inc. +# Copyright (C) 2008-2015 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, |