diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-12-27 20:01:10 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2011-12-27 20:01:10 +0100 |
| commit | 3133f30fc83dda9ba157a44a0d7ad671eef1d001 (patch) | |
| tree | a1e0ad9c64fb2ff65313e9506f1435b5e5e96392 | |
| parent | 6612fe8d073bf292f5dc7f6271c76f714e81d9d1 (diff) | |
| parent | 38efefacd69276fbb8be0646da0e5bd4870f24a8 (diff) | |
Merge branch 'master' of git://dev.medozas.de/conntrack-tools
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 7 insertions, 10 deletions
@@ -1,5 +1,5 @@ -.deps -.libs +.deps/ +.libs/ Makefile Makefile.in *.o @@ -7,12 +7,8 @@ Makefile.in *.lo /aclocal.m4 -/autom4te.cache +/autom4te.cache/ +/build-aux/ /config.* /configure -/depcomp -/install-sh /libtool -/ltmain.sh -/missing -/ylwrap diff --git a/configure.ac b/configure.ac index 64d354f..22582b8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,10 @@ AC_INIT(conntrack-tools, 1.0.0, pablo@netfilter.org) +AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST - AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-bzip2 1.6]) +AM_INIT_AUTOMAKE([-Wall foreign subdir-objects + tar-pax no-dist-gzip dist-bzip2 1.6]) dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |