summary refs log tree commit diff
path: root/src/tool
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-09-24 20:28:02 +0200
committerAlexander Barton <alex@barton.de>2012-09-24 20:28:02 +0200
commit8cfb9104419d3c00fbef3fe8639eb04f03d83f3d (patch)
tree0e6447693d035653bd309b0f12fb0e7077836005 /src/tool
parenta3f3a1097b41d96571c0606b7096aabeeccb8e70 (diff)
parent039a939cb8a85f242a017cb4c68003af2b02dfca (diff)
downloadngircd-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/tool')
-rw-r--r--src/tool/.gitignore1
-rw-r--r--src/tool/Makefile.ng (renamed from src/tool/Makefile.am)4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/tool/.gitignore b/src/tool/.gitignore
new file mode 100644
index 00000000..08a6d725
--- /dev/null
+++ b/src/tool/.gitignore
@@ -0,0 +1 @@
+Makefile.am
diff --git a/src/tool/Makefile.am b/src/tool/Makefile.ng
index a515b4d3..460f1148 100644
--- a/src/tool/Makefile.am
+++ b/src/tool/Makefile.ng
@@ -9,7 +9,9 @@
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 
-AUTOMAKE_OPTIONS = ../portab/ansi2knr
+__ng_Makefile_am_template__
+
+EXTRA_DIST = Makefile.ng
 
 AM_CPPFLAGS = -I$(srcdir)/../portab