summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2013-01-26 12:00:37 (UTC)
committer Michael Krelin <hacker@klever.net>2013-01-26 12:00:37 (UTC)
commit98b8a37be835d50b71416acd6d285e1eb525b2a1 (patch) (unidiff)
tree45e2ff2f2fa08c266de70f35b1c2b41326150cc4
parent6242fdc322cecae7e9d71b390f91ef9dc8f1a162 (diff)
downloadiii-98b8a37be835d50b71416acd6d285e1eb525b2a1.zip
iii-98b8a37be835d50b71416acd6d285e1eb525b2a1.tar.gz
iii-98b8a37be835d50b71416acd6d285e1eb525b2a1.tar.bz2
slightly reworked autotools
introduced aux.d directory and prettified and improved autogen.bash to run from the build directory in case it differs from source. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore4
-rw-r--r--autogen.bash9
-rw-r--r--autogen.sh8
-rw-r--r--configure.ac1
4 files changed, 11 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index f99d160..6b59f6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,14 @@
1Makefile 1Makefile
2Makefile.in 2Makefile.in
3/aclocal.m4 3/aclocal.m4
4/autom4te.cache 4/autom4te.cache
5/config.h 5/config.h
6/config.h.in 6/config.h.in
7/config.log 7/config.log
8/config.status 8/config.status
9/configure 9/configure
10/stamp-h1 10/stamp-h1
11/INSTALL 11/INSTALL
12/depcomp
13/install-sh
14/missing
15/NEWS 12/NEWS
16TAGS 13TAGS
14/aux.d
diff --git a/autogen.bash b/autogen.bash
new file mode 100644
index 0000000..a798fad
--- a/dev/null
+++ b/autogen.bash
@@ -0,0 +1,9 @@
1#!/bin/bash
2( cd "$(dirname "$0")" \
3&& mkdir -p aux.d \
4&& aclocal \
5&& autoheader \
6&& automake -a \
7&& autoconf \
8&& "$(dirname "$0")"/configure "$@" \
9)
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100644
index 86d2d88..0000000
--- a/autogen.sh
+++ b/dev/null
@@ -1,8 +0,0 @@
1#!/bin/sh
2WANT_AUTOMAKE=1.8
3export WANT_AUTOMAKE
4 aclocal \
5&& autoheader \
6&& automake -a \
7&& autoconf \
8&& ./configure "$@"
diff --git a/configure.ac b/configure.ac
index c814b53..1e0e42c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,15 @@
1AC_INIT([iii], [0.3], [iii-bugs@klever.net]) 1AC_INIT([iii], [0.3], [iii-bugs@klever.net])
2AC_CONFIG_SRCDIR([src/iiid.cc]) 2AC_CONFIG_SRCDIR([src/iiid.cc])
3AC_CONFIG_AUX_DIR([aux.d])
3AC_CONFIG_HEADERS([config.h]) 4AC_CONFIG_HEADERS([config.h])
4AM_INIT_AUTOMAKE([dist-bzip2]) 5AM_INIT_AUTOMAKE([dist-bzip2])
5 6
6AC_PROG_INSTALL 7AC_PROG_INSTALL
7AC_PROG_CXX 8AC_PROG_CXX
8AC_PROG_CC 9AC_PROG_CC
9PKG_PROG_PKG_CONFIG 10PKG_PROG_PKG_CONFIG
10 11
11AC_HEADER_STDC 12AC_HEADER_STDC
12 13
13AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 14AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
14 15