Changeset 2112

Timestamp:

Nov 15, 2009, 5:59:00 PM (13 years ago)

Author:

Peter

Message:

Note, this will likely break the Makefile; you need to run autoreconf -m.

Moving maintainer rules to an m4 autoconf macro to make it more
reusable. The macro creates an automake fragment file, which is
included in the top Makefile.am. The macro also searches a tool to
calculate md5sum. We prefer gmd5sum over md5, i.e., on Darwin we
prefer the GNU version installed by port.

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• build_support/svn_support.am (deleted)
• configure.ac (modified) (2 diffs)
• m4/ax_ac_print_to_file.m4 (added)
• m4/ax_file_escapes.m4 (added)
• m4/yat_svn_release.m4 (added)

trunk/Makefile.am

@@ -41 +41 @@
   $(MAKE) install $(AM_MAKEFLAGS) INSTALL_HEADER="$(install_sh_DATA) -C"
 
-if ENABLE_SVN_SUPPORT
-include build_support/svn_support.am
-else
-release: 
-  @echo "ERROR: target 'release' not activated."
-  @echo "       You need to run configure with '--enable-svn-support'."
-  @exit 1
-endif
-
 # This is a workaround to avoid a broken make when .m4 files are
 # renamed or deleted. Something similar will be provided by Automake 1.11
 $(am__aclocal_m4_deps):
+
+###############################################################
+## 
+## Some targets useful for the maintainer
+##
+MAINTAINER_CHECK_LOCAL = maintainer-check-local
+RELEASE_LOCAL = ltversion-check
+
+.PHONY: maintainer-check-local ltversion-check
+
+ltversion-check:
+  @case `sed 200q $(srcdir)/m4/version.m4` in \
+  *yat-$(VERSION)*$(YAT_LT_VERSION)*);; \
+  *) \
+    echo "version.m4: YAT_LT_VERSION not updated;" 1>&2;\
+    echo "  expected to find 'yat-$(VERSION)  $(YAT_LT_VERSION)'" 1>&2;\
+    exit 1;; \
+  esac
+
+maintainer-check-local: 
+  mkdir _inst
+  @mcl_install=`cd _inst && pwd` \
+  && $(MAKE) $(AM_MAKEFLAGS) prefix=$$mcl_install \
+  && $(MAKE) $(AM_MAKEFLAGS) prefix=$$mcl_install install \
+  && cd test && $(MAKE) $(AM_MAKEFLAGS) prefix=$$mcl_install yat_check_yat_test
+
+include $(srcdir)/maintainer.am

trunk/configure.ac

@@ -74 +74 @@
 AS_IF([test "x$ECHO" = x], [ECHO=echo])
 AC_SUBST(ECHO)
-
-AC_CHECK_PROGS([MD5], [md5sum md5 md5deep], [no])
 
 AC_MSG_NOTICE(dnl
@@ -399 +397 @@
 AC_SUBST(AM_LDFLAGS)
 
+YAT_SVN_RELEASE
 
 # Create output.