Clean up build system and update copyright information.

git-svn-id: svn://svn.zoy.org/elk/trunk@274 55e467fa-43c5-0310-a8a2-de718669efc6
2009-12-19 12:28:26 +00:00 · 2009-12-19 12:28:26 +00:00 · 776c2c2fcc
parent dcdb7f3f16
commit 776c2c2fcc
204 changed files with 356 additions and 245 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,34 @@
+# Generic autotools files
+*.o
+*.lo
+*.la
+*.exe
+*.pc
+.auto
+.libs
+.deps
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.h.in
+config.h
+config.log
+config.status
+configure
+libtool
+stamp-*
+*-stamp
+# Configure-generated files
+include/site.h
+scm/slib.scm
+# Build-generated files
+src/elk
+lib/xwidgets/xaw/*.c
+lib/xwidgets/motif/*.c
+doc/*/*.inx
+doc/*/*.ms
+doc/*/*.ps
+doc/*/*.raw
+doc/*/*.ref
+doc/cprog/side
--- a/16
+++ b/16
@ -2,16 +2,16 @@ $Id$

 Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
 (except for the contents of the directory `doc/usenix').
-Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris

 This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
 by Oliver Laumann (me) for TELES Telematic Services, Berlin, in a joint
 project between TELES and Nixdorf Microprocessor Engineering, Berlin).

-Oliver Laumann, TELES GmbH, and Nixdorf Computer AG, as co-owners or
-individual owners of copyright in this software, grant to any person or
-company a worldwide, royalty free, license to
+Sam Hocevar, Oliver Laumann, TELES GmbH, and Nixdorf Computer AG, as
+co-owners or individual owners of copyright in this software, grant to
+any person or company a worldwide, royalty free, license to

   i) copy this software,
  ii) prepare derivative works based on this software,
@ -19,10 +19,10 @@ company a worldwide, royalty free, license to
  iv) perform this software, or
   v) display this software,

-provided that this notice is not removed and that neither Oliver Laumann
-nor Teles nor Nixdorf are deemed to have made any representations as to
-the suitability of this software for any purpose nor are held responsible
-for any defects of this software.
+provided that this notice is not removed and that neither Sam Hocevar,
+Oliver Laumann, nor Teles nor Nixdorf are deemed to have made any
+representations as to the suitability of this software for any purpose
+nor are held responsible for any defects of this software.

 THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.

--- a/Makefile.am
+++ b/Makefile.am
@ -1,6 +1,6 @@
 NULL = 

-SUBDIRS = include src lib scm doc examples
+SUBDIRS = include src lib scm doc examples test
 DIST_SUBDIRS = $(SUBDIRS)

 EXTRA_DIST = \
--- a/64
+++ b/64
@ -1,15 +1,18 @@
 #! /bin/sh
+# $Id$

-# bootstrap: the ultimate bootstrap/autogen.sh script for autotools projects
-# Copyright (c) 2002, 2003, 2004, 2005, 2006 Sam Hocevar <sam@zoy.org>
+# bootstrap: generic bootstrap/autogen.sh script for autotools projects
 #
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of the Do What The Fuck You Want To
-#    Public License, Version 2, as published by Sam Hocevar. See
+# Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net>
+#
+#    This program is free software. It comes without any warranty, to
+#    the extent permitted by applicable law. You can redistribute it
+#    and/or modify it under the terms of the Do What The Fuck You Want
+#    To Public License, Version 2, as published by Sam Hocevar. See
 #    http://sam.zoy.org/wtfpl/COPYING for more details.
 #
 # The latest version of this script can be found at the following place:
-#   http://sam.zoy.org/autotools/
+#   http://caca.zoy.org/wiki/build

 # Die if an error occurs
 set -e
@ -25,15 +28,21 @@ else
 fi

 # Check for needed features
-auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *( *\([^ )]*\).*/\1/p' $conffile`"
-libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
-header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
+auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
+pkgconfig="`grep '^[ \t]*PKG_PROG_PKG_CONFIG' $conffile >/dev/null 2>&1 && echo yes || echo no`"
+libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo yes || echo no`"
+header="`grep '^[ \t]*A._CONFIG_HEADER' $conffile >/dev/null 2>&1 && echo yes || echo no`"
+makefile="`[ -f Makefile.am ] && echo yes || echo no`"
+aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/null || :`"

 # Check for automake
 amvers="no"
-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
-  if automake${v} --version >/dev/null 2>&1; then
-    amvers="${v}"
+for v in 11 10 9 8 7 6 5; do
+  if automake-1.${v} --version >/dev/null 2>&1; then
+    amvers="-1.${v}"
+    break
+  elif automake1.${v} --version >/dev/null 2>&1; then
+    amvers="1.${v}"
    break
  fi
 done
@ -86,10 +95,23 @@ if test "$libtool" = "yes"; then
  fi
 fi

+# Check for pkg-config
+if test "$pkgconfig" = "yes"; then
+  if ! pkg-config --version >/dev/null 2>&1; then
+    echo "$0: you need pkg-config"
+    exit 1
+  fi
+fi
+
 # Remove old cruft
 for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done
 rm -Rf autom4te.cache
-if test -n "$auxdir" -a ! -d "$auxdir"; then mkdir "$auxdir"; fi
+if test -n "$auxdir"; then
+  if test ! -d "$auxdir"; then
+    mkdir "$auxdir"
+  fi
+  aclocalflags="${aclocalflags} -I $auxdir -I ."
+fi

 # Explain what we are doing from now
 set -x
@ -97,24 +119,22 @@ set -x
 # Bootstrap package
 if test "$libtool" = "yes"; then
  ${libtoolize} --copy --force
-  if test -n "$auxdir" -a -f "ltmain.sh"; then
+  if test -n "$auxdir" -a ! "$auxdir" = "." -a -f "ltmain.sh"; then
    echo "$0: working around a minor libtool issue"
    mv ltmain.sh "$auxdir/"
  fi
 fi

-if test -n "$auxdir"; then
-  aclocal${amvers} -I autotools
-else
-  aclocal${amvers}
-fi
+aclocal${amvers} ${aclocalflags}
 autoconf${acvers}
 if test "$header" = "yes"; then
  autoheader${acvers}
 fi
-#add --include-deps if you want to bootstrap with any other compiler than gcc
-#automake${amvers} --add-missing --copy --include-deps
-automake${amvers} --foreign --add-missing --copy
+if test "$makefile" = "yes"; then
+  #add --include-deps if you want to bootstrap with any other compiler than gcc
+  #automake${amvers} --add-missing --copy --include-deps
+  automake${amvers} --foreign --add-missing --copy
+fi

 # Remove cruft that we no longer want
 rm -Rf autom4te.cache
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #! /bin/sh

-##  Win32 cross-compilation for Elk -- Sam Hocevar <sam@zoy.org>
+##  Win32 cross-compilation for Elk -- Sam Hocevar <sam@hocevar.net>
 ##  $Id$

 set -x
--- a/configure.ac
+++ b/configure.ac
@ -3,11 +3,11 @@
 AC_INIT(src/main.c)

 AC_PREREQ(2.50)
-AC_CONFIG_AUX_DIR(autotools)
+AC_CONFIG_AUX_DIR(.auto)
 AC_CANONICAL_SYSTEM

 AM_INIT_AUTOMAKE(elk, 3.99.7)
-AM_MAINTAINER_MODE
+dnl AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(config.h)

 AC_PROG_CC
@ -598,6 +598,7 @@ AC_OUTPUT([
  lib/xwidgets/motif/Makefile
  scm/Makefile
  src/Makefile
+  test/Makefile

  scm/slib.scm
  include/site.h
--- a/doc/bitstring/Makefile.am
+++ b/doc/bitstring/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/doc/cprog/Makefile.am
+++ b/doc/cprog/Makefile.am
@ -30,6 +30,6 @@ side: $(MANUAL)
 cprog.html: $(MANUAL) side.ref
 	$(MKINDEX) $(MANUAL) | sed -f side.ref | $(UNROFF) document=cprog

-check:
-	cknr -c.Tc -a.Es.Ee.Cs.Ce $(MANUAL)
+#check:
+#	cknr -c.Tc -a.Es.Ee.Cs.Ce $(MANUAL)

--- a/doc/kernel/Makefile.am
+++ b/doc/kernel/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/doc/oops/Makefile.am
+++ b/doc/oops/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/doc/record/Makefile.am
+++ b/doc/record/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/doc/regexp/Makefile.am
+++ b/doc/regexp/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/doc/unix/Makefile.am
+++ b/doc/unix/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/doc/xlib/Makefile.am
+++ b/doc/xlib/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/doc/xt/Makefile.am
+++ b/doc/xt/Makefile.am
@ -25,7 +25,7 @@ index.ms: $(MANUAL) index.raw
 index.raw: $(MANUAL)
 	$(TROFF) $(MANUAL) 2> index.raw >/dev/null

-check:
-	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
-	    | grep -v "Empty command"
+#check:
+#	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] $(MANUAL) \
+#	    | grep -v "Empty command"

--- a/examples/tests/Makefile.am
+++ b/examples/tests/Makefile.am
@ -4,7 +4,7 @@ CLEANFILES = $(allstamps) mytest.scm tmp1 tmp2 tmp3
 allstamps = stamp-r4rs stamp-gc

 if NATIVE_BUILD
-all-local: $(allstamps)
+check-local: $(allstamps)
 endif

 stamp-r4rs: $(top_builddir)/src/elk
--- a/include/compat.h
+++ b/include/compat.h
@ -4,7 +4,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/cstring.h
+++ b/include/cstring.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/exception.h
+++ b/include/exception.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/extern.h
+++ b/include/extern.h
@ -4,7 +4,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/funcproto.h
+++ b/include/funcproto.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/gc.h
+++ b/include/gc.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/intern.h
+++ b/include/intern.h
@ -4,7 +4,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/kernel.h
+++ b/include/kernel.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/misc.h
+++ b/include/misc.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/object.h
+++ b/include/object.h
@ -4,7 +4,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/param.h
+++ b/include/param.h
@ -4,7 +4,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/scheme.h
+++ b/include/scheme.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/site.h.in
+++ b/include/site.h.in
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/stkmem.h
+++ b/include/stkmem.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/include/type.h
+++ b/include/type.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/Makefile.am
+++ b/lib/misc/Makefile.am
@ -62,3 +62,5 @@ newhandler_la_SOURCES = newhandler.cpp
 newhandler_la_LDFLAGS = -module -avoid-version -no-undefined
 newhandler_la_LIBADD = $(top_builddir)/src/libelk.la

+echo-sources: ; echo $(SOURCES)
+
--- a/lib/misc/bitstring.c
+++ b/lib/misc/bitstring.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/debug.c
+++ b/lib/misc/debug.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/elk-eval.c
+++ b/lib/misc/elk-eval.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/gdbm.c
+++ b/lib/misc/gdbm.c
@ -4,7 +4,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/hack.c
+++ b/lib/misc/hack.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/monitor.c
+++ b/lib/misc/monitor.c
@ -7,7 +7,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/record.c
+++ b/lib/misc/record.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/regexp.c
+++ b/lib/misc/regexp.c
@ -7,7 +7,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/misc/struct.c
+++ b/lib/misc/struct.c
@ -5,7 +5,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/Makefile.am
+++ b/lib/unix/Makefile.am
@ -25,3 +25,5 @@ unix_la_LIBADD = $(top_builddir)/src/libelk.la
 extensions_HEADERS = unix.h
 extensionsdir = $(pkgincludedir)/extensions

+echo-sources: ; echo $(SOURCES)
+
--- a/lib/unix/error.c
+++ b/lib/unix/error.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/fdescr.c
+++ b/lib/unix/fdescr.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/file.c
+++ b/lib/unix/file.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/lock.c
+++ b/lib/unix/lock.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/misc.c
+++ b/lib/unix/misc.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/passwd.c
+++ b/lib/unix/passwd.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/process.c
+++ b/lib/unix/process.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/signal.c
+++ b/lib/unix/signal.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/system.c
+++ b/lib/unix/system.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/temp.c
+++ b/lib/unix/temp.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/time.c
+++ b/lib/unix/time.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/unix.c
+++ b/lib/unix/unix.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/unix.h
+++ b/lib/unix/unix.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/unix/wait.c
+++ b/lib/unix/wait.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/Makefile.am
+++ b/lib/xlib/Makefile.am
@ -46,3 +46,5 @@ xlib_la_LIBADD = $(top_builddir)/src/libelk.la libelk-xlib.la @X_LIBS@
 extensions_HEADERS = xlib.h
 extensionsdir = $(pkgincludedir)/extensions

+echo-sources: ; echo $(SOURCES)
+
--- a/lib/xlib/client.c
+++ b/lib/xlib/client.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/color.c
+++ b/lib/xlib/color.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/colormap.c
+++ b/lib/xlib/colormap.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/cursor.c
+++ b/lib/xlib/cursor.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/display.c
+++ b/lib/xlib/display.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/error.c
+++ b/lib/xlib/error.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/event.c
+++ b/lib/xlib/event.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/extension.c
+++ b/lib/xlib/extension.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/font.c
+++ b/lib/xlib/font.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/gcontext.c
+++ b/lib/xlib/gcontext.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/grab.c
+++ b/lib/xlib/grab.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/graphics.c
+++ b/lib/xlib/graphics.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/init.c
+++ b/lib/xlib/init.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/key.c
+++ b/lib/xlib/key.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/objects.c
+++ b/lib/xlib/objects.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/pixel.c
+++ b/lib/xlib/pixel.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/pixmap.c
+++ b/lib/xlib/pixmap.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/property.c
+++ b/lib/xlib/property.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/text.c
+++ b/lib/xlib/text.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/type.c
+++ b/lib/xlib/type.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/util.c
+++ b/lib/xlib/util.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/window.c
+++ b/lib/xlib/window.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/wm.c
+++ b/lib/xlib/wm.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xlib/xlib.h
+++ b/lib/xlib/xlib.h
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/Makefile.am
+++ b/lib/xwidgets/Makefile.am
@ -37,3 +37,5 @@ SOURCES_XT = \
 	widget.c \
 	$(NULL)

+echo-sources: ; echo $(SOURCES)
+
--- a/lib/xwidgets/accelerator.c
+++ b/lib/xwidgets/accelerator.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/action.c
+++ b/lib/xwidgets/action.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/callback.c
+++ b/lib/xwidgets/callback.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/class.c
+++ b/lib/xwidgets/class.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/classname.c
+++ b/lib/xwidgets/classname.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/context.c
+++ b/lib/xwidgets/context.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/converter.c
+++ b/lib/xwidgets/converter.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/error.c
+++ b/lib/xwidgets/error.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/function.c
+++ b/lib/xwidgets/function.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/identifier.c
+++ b/lib/xwidgets/identifier.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/init.c
+++ b/lib/xwidgets/init.c
@ -3,7 +3,7 @@
 * $Id$
 *
 * Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
- * Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+ * Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 *
 * This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 * 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/motif/Makefile.am
+++ b/lib/xwidgets/motif/Makefile.am
@ -73,3 +73,5 @@ SOURCES_MOTIF_D = \
 	toggle-btn.d \
 	$(NULL)

+echo-sources: ; echo $(SOURCES)
+
--- a/lib/xwidgets/motif/arrow-button.d
+++ b/lib/xwidgets/motif/arrow-button.d
@ -3,7 +3,7 @@
 ;; $Id$
 ;;
 ;; Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
-;; Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+;; Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 ;;
 ;; This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 ;; 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/motif/bulletin-brd.d
+++ b/lib/xwidgets/motif/bulletin-brd.d
@ -3,7 +3,7 @@
 ;; $Id$
 ;;
 ;; Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
-;; Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+;; Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 ;;
 ;; This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 ;; 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/motif/cascade-btn.d
+++ b/lib/xwidgets/motif/cascade-btn.d
@ -3,7 +3,7 @@
 ;; $Id$
 ;;
 ;; Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
-;; Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+;; Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 ;;
 ;; This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 ;; 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/motif/command.d
+++ b/lib/xwidgets/motif/command.d
@ -3,7 +3,7 @@
 ;; $Id$
 ;;
 ;; Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
-;; Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+;; Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 ;;
 ;; This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 ;; 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/motif/drawing-area.d
+++ b/lib/xwidgets/motif/drawing-area.d
@ -3,7 +3,7 @@
 ;; $Id$
 ;;
 ;; Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
-;; Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+;; Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 ;;
 ;; This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 ;; 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/lib/xwidgets/motif/drawn-button.d
+++ b/lib/xwidgets/motif/drawn-button.d
@ -3,7 +3,7 @@
 ;; $Id$
 ;;
 ;; Copyright 1990, 1991, 1992, 1993, 1994, 1995, Oliver Laumann, Berlin
-;; Copyright 2002, 2003 Sam Hocevar <sam@zoy.org>, Paris
+;; Copyright 2002, 2003 Sam Hocevar <sam@hocevar.net>, Paris
 ;;
 ;; This software was derived from Elk 1.2, which was Copyright 1987, 1988,
 ;; 1989, Nixdorf Computer AG and TELES GmbH, Berlin (Elk 1.2 has been written
--- a/Show More
+++ b/Show More