misc: some source code cleanup.

bootstrap

@@ -36,14 +36,21 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/n
 
 # Check for automake
 amvers="no"
-for v in 13 12 11 10 9 8 7 6 5; do
+v=5
+tries=0
+while : ; do
   if automake-1.${v} --version >/dev/null 2>&1; then
     amvers="-1.${v}"
-    break
+    tries=0
   elif automake1.${v} --version >/dev/null 2>&1; then
     amvers="1.${v}"
+    tries=0
+  fi
+  if [ "$tries" = 20 ]; then
     break
   fi
+  v="$((v + 1))"
+  tries="$((tries + 1))"
 done
 
 if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then

caca/attr.c

@@ -1,6 +1,6 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2014 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
  *  This library is free software. It comes without any warranty, to

caca/codec/codec.h

@@ -1,6 +1,6 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2014 Sam Hocevar <sam@hocevar.net>
  *                2006 Jean-Yves Lamoureux <jylam@lnxscene.org>
  *                All Rights Reserved
  *

caca/codec/import.c

@@ -1,6 +1,6 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2014 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
  *  This library is free software. It comes without any warranty, to

caca/codec/text.c

@@ -1,6 +1,6 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2014 Sam Hocevar <sam@hocevar.net>
  *                2006 Jean-Yves Lamoureux <jylam@lnxscene.org>
  *                All Rights Reserved
  *

caca/driver/ncurses.c

@@ -1,6 +1,6 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2014 Sam Hocevar <sam@hocevar.net>
  *                2007 Ben Wiley Sittler <bsittler@gmail.com>
  *                All Rights Reserved
  *

caca/driver/x11.c

@@ -1,6 +1,6 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2012 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2014 Sam Hocevar <sam@hocevar.net>
  *                2007 Ben Wiley Sittler <bsittler@gmail.com>
  *                All Rights Reserved
  *

configure.ac

@@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.auto)
 AC_CANONICAL_SYSTEM
 dnl  We cannot use subdir-objects because of a bug that will eg. remove
 dnl  ../src/.deps upon distclean when a file from ../src/ is used.
-AM_INIT_AUTOMAKE([no-define tar-ustar silent-rules])
+AM_INIT_AUTOMAKE([no-define tar-ustar silent-rules subdir-objects])
 dnl AM_MAINTAINER_MODE
 AM_DEFAULT_VERBOSITY=0
 

examples/conio.c

@@ -16,7 +16,7 @@
  */
 
 /*Ported to libcaca
- *Copyright (c) 2009-2010 Sam Hocevar <sam@hocevar.net>
+ *Copyright (c) 2009-2014 Sam Hocevar <sam@hocevar.net>
 */
 
 #include "config.h"

ruby/caca-canvas.c

@@ -1,6 +1,6 @@
 /*
  *  libcaca Ruby bindings
- *  Copyright (c) 2007-2012 Pascal Terjan <pterjan@linuxfr.org>
+ *  Copyright (c) 2007-2014 Pascal Terjan <pterjan@linuxfr.org>
  *
  *  This library is free software. It comes without any warranty, to
  *  the extent permitted by applicable law. You can redistribute it

src/cacaserver.c

@@ -1,7 +1,7 @@
 /*
  *  cacaserver    Colour ASCII-Art library
  *  Copyright (c) 2006 Jean-Yves Lamoureux <jylam@lnxscene.org>
- *                2006-2012 Sam Hocevar <sam@hocevar.net>
+ *                2006-2014 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
  *  This program is free software. It comes without any warranty, to
@@ -321,10 +321,10 @@ static void manage_connections(struct server *server)
     {
         server->clients = malloc(sizeof(struct client));
         if(server->clients == NULL)
-	{
+        {
             close(fd);
             return;
-	}
+        }
     }
     else
     {

tools/sortchars.c

@@ -1,6 +1,6 @@
 /*
  *  sortchars     analyse ASCII characters
- *  Copyright (c) 2007-2012 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2007-2014 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
  *