diff options
| author | Alexander Barton <alex@barton.de> | 2012-09-24 20:28:02 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2012-09-24 20:28:02 +0200 |
| commit | 8cfb9104419d3c00fbef3fe8639eb04f03d83f3d (patch) | |
| tree | 0e6447693d035653bd309b0f12fb0e7077836005 /src/testsuite | |
| parent | a3f3a1097b41d96571c0606b7096aabeeccb8e70 (diff) | |
| parent | 039a939cb8a85f242a017cb4c68003af2b02dfca (diff) | |
| download | ngircd-8cfb9104419d3c00fbef3fe8639eb04f03d83f3d.tar.gz ngircd-8cfb9104419d3c00fbef3fe8639eb04f03d83f3d.zip | |
Merge branch 'automake-am11-am12'
* automake-am11-am12: autogen.sh: detect automake version format a.b.c and a.b configure.ng: don't require GIT tree to detect version string Include .mailmap file in distribution archives Include all build-system files into distribution archives Change build system to support new and old GNU automake
Diffstat (limited to 'src/testsuite')
| -rw-r--r-- | src/testsuite/.gitignore | 1 | ||||
| -rw-r--r-- | src/testsuite/Makefile.ng (renamed from src/testsuite/Makefile.am) | 17 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/testsuite/.gitignore b/src/testsuite/.gitignore index 5884a486..b33a08f4 100644 --- a/src/testsuite/.gitignore +++ b/src/testsuite/.gitignore @@ -1,3 +1,4 @@ +Makefile.am T-ngircd1 T-ngircd2 channel-test diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.ng index 5a2a9412..b47ba0e5 100644 --- a/src/testsuite/Makefile.am +++ b/src/testsuite/Makefile.ng @@ -1,21 +1,20 @@ # # ngIRCd -- The Next Generation IRC Daemon -# Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors. +# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors # -# Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen -# der GNU General Public License (GPL), wie von der Free Software Foundation -# herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 -# der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. -# Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste -# der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. +# 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 +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# Please read the file COPYING, README and AUTHORS for more information. # -AUTOMAKE_OPTIONS = ../portab/ansi2knr +__ng_Makefile_am_template__ AM_CPPFLAGS = -I$(srcdir)/../portab EXTRA_DIST = \ - README functions.inc getpid.sh \ + Makefile.ng README functions.inc getpid.sh \ start-server.sh stop-server.sh tests.sh stress-server.sh \ test-loop.sh wait-tests.sh \ channel-test.e connect-test.e check-idle.e invite-test.e \ |