Changeset 1509

Timestamp:

Sep 1, 2012, 9:16:28 AM (9 years ago)

Author:

Peter Johansson

Message:

update macros from yat (version 0.9pre)

Location:

trunk/m4

Files:

• yat_am_macros.m4 (modified) (5 diffs)
• yat_svn_release.m4 (modified) (6 diffs)

trunk/m4/yat_am_macros.m4

@@ -1 @@
-## $Id: yat_am_macros.m4 2680 2012-01-09 02:28:59Z peter $
-
-# serial 9 (yat 0.9)
+## $Id: yat_am_macros.m4 2807 2012-08-05 23:39:51Z peter $
+
+# serial 11 (yat 0.9)
 
 m4_define([yat_am_macros_copyright], [
 #
-#   Copyright (C) 2011 Peter Johansson
+#   Copyright (C) 2011, 2012 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -107 +107 @@
 YAT_SVN_REVISION_FORCE:
 $(srcdir)/yat_svn_revision_FILE: YAT_SVN_REVISION_FORCE
-  @$(SVNVERSION) $(srcdir) > [$][@]-t \
+  $(AM_V_at)$(SVNVERSION) $(srcdir) > [$][@]-t \
   && $(MOVE_IF_CHANGE) [$][@]-t [$][@]
 endif
@@ -157 +157 @@
 BUILT_SOURCES += $(builddir)/]yat_HEADER_FILE[
 $(builddir)/]yat_HEADER_FILE[: $(srcdir)/yat_HEADER_FILE.in $(srcdir)/]yat_INPUT_FILE[
-  revision=$$(cat $(srcdir)/]yat_INPUT_FILE[) \
+  $(AM_V_at)revision=$$(cat $(srcdir)/]yat_INPUT_FILE[) \
   && sed "s|@]yat_REVISION_DEFINE[@|$$revision|g" < $(srcdir)/]yat_HEADER_FILE.in[ \
   > [$][@]-t && mv [$][@]-t [$][@]
@@ -203 +203 @@
 if HAVE_SVN_WC
 $(srcdir)/YAT_release_year: RELEASE_YEAR_FORCE
-  @if $(SVNVERSION) $(srcdir) | grep 'M' > /dev/null; then \
+  $(AM_V_at)if $(SVNVERSION) $(srcdir) | grep 'M' > /dev/null; then \
      date -u "+%%Y" > [$][@]-t \
      && $(MOVE_IF_CHANGE) [$][@]-t [$][@]; \
@@ -226 +226 @@
 [# ]$1[ generated automatically by GNU Autoconf
 ]yat_am_macros_copyright[
-# stub rule to work around bug in Automake
+# stub rule to work around bug in Automake 1.11
 \$(top_srcdir)/]$1[:
 

trunk/m4/yat_svn_release.m4

@@ -1 @@
-## $Id: yat_svn_release.m4 2448 2011-03-28 18:57:33Z peter $
+## $Id: yat_svn_release.m4 2787 2012-07-23 03:14:44Z peter $
 
-# serial 7 (yat 0.8)
+# serial 9 (yat 0.9)
 
 # SYNOPSIS
@@ -9 +9 @@
 # DESCRIPTION
 #
-#   Creates a few make rules useful for maintainer. You need to add 
+#   Creates a few make rules useful for maintainer. You need to add
 #
 #     include $(srcdir)/maintainer.am
@@ -24 +24 @@
 #
 # COPYLEFT
-m4_define([yat_svn_release_copyright], [
+m4_define([yat_svn_release_copyright], [dnl
 #
-#   Copyright (C) 2009, 2010, 2011 Peter Johansson
+#   Copyright (C) 2009, 2010, 2011, 2012 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -47 +47 @@
 AC_DEFUN([YAT_SVN_RELEASE],
 [
-  AC_REQUIRE([AC_PROG_SED])       
-  AC_REQUIRE([AC_PROG_EGREP])       
+  AC_REQUIRE([AC_PROG_SED])
+  AC_REQUIRE([AC_PROG_EGREP])
   AC_CHECK_PROGS([MD5], [md5sum gmd5sum md5 md5deep], [no])
   m4_pushdef([YAT_OUTPUTFILE], [m4_default([$1], [maintainer.am])])
 
-  AX_AC_PRINT_TO_FILE(YAT_OUTPUTFILE, 
+  AX_AC_PRINT_TO_FILE(YAT_OUTPUTFILE,
 [#  ]YAT_OUTPUTFILE[ generated by autoconf from $0
 ]yat_svn_release_copyright[
@@ -58 +58 @@
         check-release-tools maintainer-check release
 
-# stub rule to work around bug in Automake
+# stub rule to work around bug in Automake 1.11
 \$(srcdir)/]YAT_OUTPUTFILE[:
 
@@ -91 +91 @@
 check-release-tools:
   @test \"x\$(MD5)\" != \"xno\" || \\
-  (echo \"no tool to calculate MD5 checksum available\" 1>&2 && exit 1) 
+  (echo \"no tool to calculate MD5 checksum available\" 1>&2 && exit 1)
 
 mc_exportdir=_exported