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/ipaddr | |
| 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/ipaddr')
| -rw-r--r-- | src/ipaddr/.gitignore | 1 | ||||
| -rw-r--r-- | src/ipaddr/Makefile.ng (renamed from src/ipaddr/Makefile.am) | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ipaddr/.gitignore b/src/ipaddr/.gitignore new file mode 100644 index 00000000..08a6d725 --- /dev/null +++ b/src/ipaddr/.gitignore @@ -0,0 +1 @@ +Makefile.am diff --git a/src/ipaddr/Makefile.am b/src/ipaddr/Makefile.ng index e898d64b..cea6899e 100644 --- a/src/ipaddr/Makefile.am +++ b/src/ipaddr/Makefile.ng @@ -3,7 +3,9 @@ # (c) 2008 Florian Westphal <fw@strlen.de>, public domain. # -AUTOMAKE_OPTIONS = ../portab/ansi2knr +__ng_Makefile_am_template__ + +EXTRA_DIST = Makefile.ng AM_CPPFLAGS = -I$(srcdir)/../portab |