3 files changed, 12 insertions, 34 deletions

diff --git a/Makefile.am b/Makefile.am
index 25f7a6b..02f5b75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -232,25 +232,13 @@ CLEANFILES				= \
 GIT_PACKAGE_VERSION_DIR=include
 SUBST_EXPRESSIONS =  \
         -e 's,[@]RELEASE_MONTH[@],@RELEASE_MONTH@,g'
-include $(srcdir)/@bindletools_srcdir@/build-aux/makefile-autotools.am
-include $(srcdir)/@bindletools_srcdir@/build-aux/makefile-subst.am
-include $(srcdir)/@bindletools_srcdir@/build-aux/makefile-version.am
-
+include $(srcdir)/contrib/bindletools/build-aux/makefile-bindle.am
+include $(srcdir)/contrib/bindletools/build-aux/makefile-autotools.am
+include $(srcdir)/contrib/bindletools/build-aux/makefile-subst.am
+include $(srcdir)/contrib/bindletools/build-aux/makefile-version.am
 
 # custom targets
-PHONY: git-package-version-check
-
-git-package-version-check:
-        @if test -f $(srcdir)/.git/config;then \
-                GPV=`git --git-dir=$(srcdir)/.git describe 2> /dev/null`; \
-                GPV=`echo $${GPV}|sed -e 's/-/./g' -e 's/^v//g'`; \
-                if test "x$${GPV}" != "x$(PACKAGE_VERSION)" && test "x$${GPV}" != "x";then \
-                        $(top_builddir)/config.status --recheck; \
-                        $(top_builddir)/config.status; \
-                fi; \
-        fi
-
-$(srcdir)/acinclude.m4: git-package-version-check
+PHONY:
 
 doc/bitops.1: Makefile $(srcdir)/doc/bitops.1.in
         $(do_subst_dt)
@@ -274,19 +262,6 @@ include/dmsversion.h: Makefile $(srcdir)/include/dmsversion.h.in
         $(mkdir_p) include
         $(do_subst_dt)
 
-license-tags: $(srcdir)/build-aux/dmstools.tags $(builddir)/src/codetagger
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/AUTHORS
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/acinclude.m4
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/configure.ac
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/ChangeLog
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/doc/codetagger.1.in
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/Makefile.am
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/NEWS
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/README
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/src/codetagger.c
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/src/common.h
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/dmstools.tags
-        $(builddir)/src/codetagger -f $(srcdir)/build-aux/dmstools.tags $(srcdir)/TODO
 
 # local targets
 install-exec-local:
diff --git a/configure.ac b/configure.ac
index 31ffc64..c1f0afa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,10 +93,6 @@ AC_PROG_LN_S
 # GNU Libtool Support
 LT_INIT(dlopen disable-fast-install win32-dll)
 
-# custom configure options
-AC_BINDLE_ENABLE_WARNINGS
-AC_BINDLE_WITH_PERL
-
 # enables getopt_long if header and functions were found
 AC_CHECK_HEADERS([getopt.h], [AC_DEFINE_UNQUOTED(USE_GETOPT_LONG, 1, [Use GNU getopt_long])])
 
@@ -130,9 +126,16 @@ AC_CHECK_TYPES([sig_t],       ,[have_signal=no],[#include <signal.h>])
 AC_SEARCH_LIBS([signal],     ,,[have_signal=no])
 AM_CONDITIONAL([HAVE_SIGNAL], [test x$have_signal = xyes])
 
+# initiates bindle tools macros
+AC_BINDLE(contrib/bindletools)
+
 # determine PACKAGE_VERSION via Git
 AC_BINDLE_GIT_PACKAGE_VERSION([contrib/bindletools/build-aux/git-package-version.sh])
 
+# custom configure options
+AC_BINDLE_ENABLE_WARNINGS
+AC_BINDLE_WITH_PERL
+
 # Creates outputs
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/contrib/bindletools b/contrib/bindletools
-Subproject 1fdd1f6ece8267ab83bb4af9b26bc6b05a756fb
+Subproject 80e61f532c705b030a7fcdc70f952b9c38fec4a