-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Makefile.am | 3 | ||||
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 1 |
4 files changed, 5 insertions, 2 deletions
@@ -1,21 +1,22 @@ | |||
1 | configure | 1 | configure |
2 | Makefile.in | 2 | Makefile.in |
3 | Doxyfile | 3 | Doxyfile |
4 | config.log | 4 | config.log |
5 | depcomp | 5 | depcomp |
6 | config.guess | 6 | config.guess |
7 | config.h | 7 | config.h |
8 | config.sub | 8 | config.sub |
9 | ltmain.sh | 9 | ltmain.sh |
10 | INSTALL | 10 | INSTALL |
11 | NEWS | 11 | NEWS |
12 | Makefile | 12 | Makefile |
13 | config.status | 13 | config.status |
14 | stamp-h1 | 14 | stamp-h1 |
15 | config.h.in | 15 | config.h.in |
16 | libtool | 16 | libtool |
17 | autom4te.cache | 17 | autom4te.cache |
18 | libopkele.pc | 18 | libopkele.pc |
19 | missing | 19 | missing |
20 | aclocal.m4 | 20 | aclocal.m4 |
21 | install-sh | 21 | install-sh |
22 | aclocal.d | ||
diff --git a/Makefile.am b/Makefile.am index 3227bdb..7726dad 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -1,28 +1,29 @@ | |||
1 | |||
2 | SUBDIRS=include lib test | 1 | SUBDIRS=include lib test |
3 | EXTRA_DIST= NEWS NEWS.xml NEWS.xsl | 2 | EXTRA_DIST= NEWS NEWS.xml NEWS.xsl |
4 | 3 | ||
4 | ACLOCAL_AMFLAGS=-I aclocal.d | ||
5 | |||
5 | pkgconfigdir=${libdir}/pkgconfig | 6 | pkgconfigdir=${libdir}/pkgconfig |
6 | pkgconfig_DATA=libopkele.pc | 7 | pkgconfig_DATA=libopkele.pc |
7 | 8 | ||
8 | all-local: NEWS | 9 | all-local: NEWS |
9 | if HAVE_DOXYGEN | 10 | if HAVE_DOXYGEN |
10 | clean-local: | 11 | clean-local: |
11 | rm -rf doxydox | 12 | rm -rf doxydox |
12 | endif | 13 | endif |
13 | 14 | ||
14 | NEWS: NEWS.xsl NEWS.xml | 15 | NEWS: NEWS.xsl NEWS.xml |
15 | ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml | 16 | ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml |
16 | 17 | ||
17 | if HAVE_DOXYGEN | 18 | if HAVE_DOXYGEN |
18 | dox: Doxyfile | 19 | dox: Doxyfile |
19 | ${DOXYGEN} | 20 | ${DOXYGEN} |
20 | endif | 21 | endif |
21 | 22 | ||
22 | ISSUEFILES = $$(find ${top_srcdir} -type f '(' \ | 23 | ISSUEFILES = $$(find ${top_srcdir} -type f '(' \ |
23 | -name '*.cc' -or -name '*.h' \ | 24 | -name '*.cc' -or -name '*.h' \ |
24 | ')' ) \ | 25 | ')' ) \ |
25 | ${top_srcdir}/configure.ac | 26 | ${top_srcdir}/configure.ac |
26 | issues: todo fixme xxx | 27 | issues: todo fixme xxx |
27 | todo fixme xxx: | 28 | todo fixme xxx: |
28 | @grep --color=auto -in '$@:' ${ISSUEFILES} || true | 29 | @grep --color=auto -in '$@:' ${ISSUEFILES} || true |
@@ -1,9 +1,9 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | WANT_AUTOMAKE=1.8 | 2 | WANT_AUTOMAKE=1.8 |
3 | export WANT_AUTOMAKE | 3 | export WANT_AUTOMAKE |
4 | libtoolize -f \ | 4 | libtoolize -f \ |
5 | && aclocal \ | 5 | && aclocal -I aclocal.d \ |
6 | && autoheader \ | 6 | && autoheader \ |
7 | && automake -a \ | 7 | && automake -a \ |
8 | && autoconf \ | 8 | && autoconf \ |
9 | && ./configure "$@" | 9 | && ./configure "$@" |
diff --git a/configure.ac b/configure.ac index a6de8c3..fd68b5b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,27 +1,28 @@ | |||
1 | AC_INIT([libopkele], [2.0.2], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [2.0.2], [libopkele-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) | 2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) |
3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) | 3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) |
4 | AC_CONFIG_MACRO_DIR([aclocal.d]) | ||
4 | AM_INIT_AUTOMAKE([dist-bzip2]) | 5 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 6 | ||
6 | AC_PROG_INSTALL | 7 | AC_PROG_INSTALL |
7 | AC_PROG_CXX | 8 | AC_PROG_CXX |
8 | AC_PROG_CC | 9 | AC_PROG_CC |
9 | AC_PROG_LIBTOOL | 10 | AC_PROG_LIBTOOL |
10 | PKG_PROG_PKG_CONFIG | 11 | PKG_PROG_PKG_CONFIG |
11 | 12 | ||
12 | AC_HEADER_STDC | 13 | AC_HEADER_STDC |
13 | AC_CHECK_FUNCS([timegm]) | 14 | AC_CHECK_FUNCS([timegm]) |
14 | 15 | ||
15 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 16 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
16 | 17 | ||
17 | AC_MSG_CHECKING([for source tree version]) | 18 | AC_MSG_CHECKING([for source tree version]) |
18 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 19 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then |
19 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" | 20 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" |
20 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ | 21 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ |
21 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" | 22 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" |
22 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" | 23 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" |
23 | else | 24 | else |
24 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 25 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
25 | fi | 26 | fi |
26 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 27 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
27 | AC_SUBST([PACKAGE_SRC_VERSION]) | 28 | AC_SUBST([PACKAGE_SRC_VERSION]) |