From: Tobias Oetiker Date: Mon, 27 May 2019 18:07:42 +0000 (+0200) Subject: released 1.7.2 X-Git-Tag: v1.7.2~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8e6915c67119c133045419ed903371f842673dc2;p=thirdparty%2Frrdtool-1.x.git released 1.7.2 --- diff --git a/CHANGES b/CHANGES index 5d580e78..55e15cf4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,14 @@ -RRDtool 1.7.2 - 2019-02-08 +RRDtool 1.7.2 - 2019-05-27 ========================== Bugfixes -------- -Updated the Makefiles to properly include all needed files into the distribution tar. -no code changes. +* Updated the Makefiles to properly include all needed files into the distribution tar +* Cleand up Compiler Warnings +* Improved compilation in MinGW environment +* fix segfault on non-existent RRD file when using rrdcached +* fix bounds handling, documentation and checking on rrdtool xport <Óscar Nájera> +* Fix %s/%S unit autoscaling in gprint for json/xml +* Optimized PDP Calculation RRDtool 1.7.1 - 2019-02-04 ========================== diff --git a/Makefile.in b/Makefile.in index 6a1280e4..60f3f584 100644 --- a/Makefile.in +++ b/Makefile.in @@ -430,7 +430,7 @@ RSYNC = rsync --rsh=ssh SUBDIRS = po src bindings tests etc $(am__append_1) $(am__append_2) EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ rrdtool.spec favicon.ico bootstrap \ - libtool \ + libtool .indent.pro \ m4/snprintf.m4 \ win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ diff --git a/bindings/perl-piped/RRDp.pm b/bindings/perl-piped/RRDp.pm index 227a8416..171a9670 100644 --- a/bindings/perl-piped/RRDp.pm +++ b/bindings/perl-piped/RRDp.pm @@ -124,7 +124,7 @@ sub cmd (@); sub end (); sub read (); -$VERSION=1.4003; +$VERSION=1.7.2; sub start ($){ croak "rrdtool is already running" diff --git a/bindings/perl-shared/RRDs.pm b/bindings/perl-shared/RRDs.pm index 034cc655..53364dc0 100644 --- a/bindings/perl-shared/RRDs.pm +++ b/bindings/perl-shared/RRDs.pm @@ -7,7 +7,7 @@ use vars qw(@ISA $VERSION); require DynaLoader; -$VERSION=1.5001; +$VERSION=1.7.2; bootstrap RRDs $VERSION; diff --git a/configure b/configure index 3790631b..4dab2cc5 100755 --- a/configure +++ b/configure @@ -636,7 +636,6 @@ HAVE_SYSTEMD_TRUE am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS -LIBOBJS systemdsystemunitdir PKG_CONFIG_LIBDIR PKG_CONFIG_PATH @@ -743,6 +742,7 @@ GMSGFMT MSGFMT GETTEXT_MACRO_VERSION USE_NLS +LIBOBJS RRD_DEFAULT_FONT WERROR LT_SYS_LIBRARY_PATH @@ -2849,7 +2849,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -LIBVERS=10:0:2 +LIBVERS=10:1:2 # Make sure we can run config.sub. @@ -14712,7 +14712,101 @@ _ACEOF fi done - _HW_FUNC_XPRINTF_REPLACE + + if test "x$_hw_cv_func_xprintf_replace_done" != xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + +#ifndef __cplusplus + /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; + const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +$as_echo "#define const /**/" >>confdefs.h + +fi + + + + + case " $LIBOBJS " in + *" rrd_snprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS rrd_snprintf.$ac_objext" + ;; +esac + + _hw_cv_func_xprintf_replace_done=yes +fi + fi @@ -14770,7 +14864,101 @@ else $as_echo "#define XXXsnprintf XXXrpl_snprintf" >>confdefs.h - _HW_FUNC_XPRINTF_REPLACE + + if test "x$_hw_cv_func_xprintf_replace_done" != xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + +#ifndef __cplusplus + /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; + const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +$as_echo "#define const /**/" >>confdefs.h + +fi + + + + + case " $LIBOBJS " in + *" rrd_snprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS rrd_snprintf.$ac_objext" + ;; +esac + + _hw_cv_func_xprintf_replace_done=yes +fi + fi @@ -14894,7 +15082,101 @@ $as_echo "#define HAVE___VA_COPY 1" >>confdefs.h fi fi - _HW_FUNC_XPRINTF_REPLACE + + if test "x$_hw_cv_func_xprintf_replace_done" != xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + +#ifndef __cplusplus + /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; + const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +$as_echo "#define const /**/" >>confdefs.h + +fi + + + + + case " $LIBOBJS " in + *" rrd_snprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS rrd_snprintf.$ac_objext" + ;; +esac + + _hw_cv_func_xprintf_replace_done=yes +fi + fi @@ -14915,7 +15197,101 @@ done $as_echo "#define XXXasprintf XXXrpl_asprintf" >>confdefs.h - _HW_FUNC_XPRINTF_REPLACE + + if test "x$_hw_cv_func_xprintf_replace_done" != xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; } +if ${ac_cv_c_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + +#ifndef __cplusplus + /* Ultrix mips cc rejects this sort of thing. */ + typedef int charset[2]; + const charset cs = { 0, 0 }; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + pcpcc = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + if (s) return 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + if (!foo) return 0; + } + return !cs[0] && !zero.x; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_const=yes +else + ac_cv_c_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +$as_echo "$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then + +$as_echo "#define const /**/" >>confdefs.h + +fi + + + + + case " $LIBOBJS " in + *" rrd_snprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS rrd_snprintf.$ac_objext" + ;; +esac + + _hw_cv_func_xprintf_replace_done=yes +fi + fi @@ -19172,7 +19548,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __MINGW32__ -#include +#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L #endif #include int diff --git a/configure.ac b/configure.ac index 0db5d88a..532920e5 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ dnl - if any functionality was removed do c++,r=0,a=0. dnl dnl see http://sourceware.org/autobook/autobook/autobook_91.html dnl -LIBVERS=10:0:2 +LIBVERS=10:1:2 AC_SUBST(LIBVERS) AC_CANONICAL_TARGET diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod index abe9298a..fdbb535d 100644 --- a/doc/rrdbuild.pod +++ b/doc/rrdbuild.pod @@ -41,7 +41,7 @@ Where you want to install the software. Once you have decided. Save the two locations into environment variables. BUILD_DIR=/tmp/rrdbuild - INSTALL_DIR=/opt/rrdtool-1.7.1 + INSTALL_DIR=/opt/rrdtool-1.7.2 If your F is mounted with the option noexec (RHEL seems to do that) you have to choose @@ -55,9 +55,9 @@ Now make sure the BUILD_DIR exists and go there: Lets first assume you already have all the necessary libraries pre-installed. - wget https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.1.tar.gz - gunzip -c rrdtool-1.7.1.tar.gz | tar xf - - cd rrdtool-1.7.1 + wget https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz + gunzip -c rrdtool-1.7.2.tar.gz | tar xf - + cd rrdtool-1.7.2 ./configure --prefix=$INSTALL_DIR && make && make install Ok, this was very optimistic. This try will probably have ended with @@ -345,7 +345,7 @@ because it seems that a fair number of people have ill configured python and tcl setups that would prevent RRDtool from building if they are included in their current state. - cd $BUILD_DIR/rrdtool-1.7.1 + cd $BUILD_DIR/rrdtool-1.7.2 ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python $MAKE clean $MAKE diff --git a/etc/Makefile.in b/etc/Makefile.in index d512fd59..d9ba12e0 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -365,7 +365,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-lsb.in \ - rrdcached.socket.in rrdcached.service.in + rrdcached-init-lsb rrdcached.socket.in rrdcached.service.in @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ @HAVE_SYSTEMD_TRUE@ rrdcached.socket \ diff --git a/po/fr.po b/po/fr.po index e2696c45..11bc3713 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rrdtool 1.7.0\n" "Report-Msgid-Bugs-To: https://github.com/oetiker/rrdtool-1.x/issues\n" -"POT-Creation-Date: 2019-02-04 14:32+0100\n" +"POT-Creation-Date: 2019-05-27 18:26+0200\n" "PO-Revision-Date: 2018-02-14 14:16+0100\n" "Last-Translator: Jean-Michel Vourgère \n" "Language-Team: English <>\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 2.0\n" -#: src/rrd_tool.c:48 +#: src/rrd_tool.c:49 #, c-format msgid "" "RRDtool %s Copyright by Tobias Oetiker \n" @@ -32,7 +32,7 @@ msgstr "" "\n" "Utilisation: rrdtool [options] commande options_de_commande\n" -#: src/rrd_tool.c:55 +#: src/rrd_tool.c:56 msgid "" "Valid commands: create, update, updatev, graph, graphv, dump, restore,\n" "\t\tlast, lastupdate, first, info, list, fetch, tune,\n" @@ -42,11 +42,11 @@ msgstr "" "\t\tlast, lastupdate, first, info, list, fetch, tune,\n" "\t\tresize, xport, flushcached\n" -#: src/rrd_tool.c:60 +#: src/rrd_tool.c:61 msgid "Valid remote commands: quit, ls, cd, mkdir, pwd\n" msgstr "Commandes à distance valides: quit, ls, cd, mkdir, pwd\n" -#: src/rrd_tool.c:64 +#: src/rrd_tool.c:65 msgid "" "* create - create a new RRD\n" "\n" @@ -70,7 +70,7 @@ msgstr "" "\t\t[DS:nom-ds:DST:arguments-dst]\n" "\t\t[RRA:CF:arguments-cf]\n" -#: src/rrd_tool.c:75 +#: src/rrd_tool.c:76 msgid "" "* dump - dump an RRD to XML\n" "\n" @@ -86,7 +86,7 @@ msgstr "" "\t\t[--daemon|-d adresse]\n" "\t\tfichier.rrd [fichier.xml]" -#: src/rrd_tool.c:82 +#: src/rrd_tool.c:83 msgid "" "* info - returns the configuration and status of the RRD\n" "\n" @@ -96,7 +96,7 @@ msgstr "" "\n" "\trrdtool info [--daemon|-d [--noflush|-F]] fichier.rrd\n" -#: src/rrd_tool.c:86 +#: src/rrd_tool.c:87 msgid "" "* list - returns the list of RRDs\n" "\n" @@ -106,7 +106,7 @@ msgstr "" "\n" "\trrdtool list [--daemon ] [--noflush] \n" -#: src/rrd_tool.c:90 +#: src/rrd_tool.c:91 msgid "" "* restore - restore an RRD file from its XML form\n" "\n" @@ -118,7 +118,7 @@ msgstr "" "\trrdtool restore [--range-check|-r] [--force-overwrite|-f] fichier.xml " "fichier.rrd\n" -#: src/rrd_tool.c:94 +#: src/rrd_tool.c:95 msgid "" "* last - show last update time for RRD\n" "\n" @@ -130,7 +130,7 @@ msgstr "" "\trrdtool last nomficher.rrd\n" "\t\t[--daemon|-d adresse]\n" -#: src/rrd_tool.c:99 +#: src/rrd_tool.c:100 msgid "" "* lastupdate - returns the most recent datum stored for\n" " each DS in an RRD\n" @@ -144,7 +144,7 @@ msgstr "" "\trrdtool lastupdate fichier.rrd\n" "\t\t[--daemon|-d adresse]\n" -#: src/rrd_tool.c:105 +#: src/rrd_tool.c:106 msgid "" "* first - show first update time for RRA within an RRD\n" "\n" @@ -154,7 +154,7 @@ msgstr "" "\n" "\trrdtool first fichier.rrd [--rraindex nombre] [--daemon|-d adresse]\n" -#: src/rrd_tool.c:109 +#: src/rrd_tool.c:110 msgid "" "* update - update an RRD\n" "\n" @@ -180,7 +180,7 @@ msgstr "" "\n" "\t\t[ time:valeur[:valeur...] ..]\n" -#: src/rrd_tool.c:119 +#: src/rrd_tool.c:120 msgid "" "* updatev - a verbose version of update\n" "\treturns information about values, RRAs, and datasources updated\n" @@ -207,7 +207,7 @@ msgstr "" "\n" "\t\t[ time:valeur[:valeur...] ..]\n" -#: src/rrd_tool.c:129 +#: src/rrd_tool.c:130 msgid "" "* fetch - fetch data out of an RRD\n" "\n" @@ -225,7 +225,7 @@ msgstr "" "\t\t[-a|--align-start]\n" "\t\t[-d|--daemon ]\n" -#: src/rrd_tool.c:137 +#: src/rrd_tool.c:138 msgid "" "* flushcached - flush cached data out to an RRD file\n" "\n" @@ -237,7 +237,7 @@ msgstr "" "\trrdtool flushcached fichier.rrd\n" "\t\t[-d|--daemon ]\n" -#: src/rrd_tool.c:144 +#: src/rrd_tool.c:145 msgid "" "* graph - generate a graph from one or several RRD\n" "\n" @@ -247,7 +247,7 @@ msgstr "" "\n" "\trrdtool graph fichier [-s|--start secondes] [-e|--end secondes]\n" -#: src/rrd_tool.c:147 +#: src/rrd_tool.c:148 msgid "" "* graphv - generate a graph from one or several RRD\n" " with meta data printed before the graph\n" @@ -259,7 +259,7 @@ msgstr "" "\n" "\trrdtool graphv fichier [-s|--start secondes] [-e|--end secondes]\n" -#: src/rrd_tool.c:151 +#: src/rrd_tool.c:152 msgid "" "\t\t[-x|--x-grid x-axis grid and label]\n" "\t\t[-Y|--alt-y-grid] [--full-size-mode]\n" @@ -289,7 +289,7 @@ msgstr "" "\t\t[-F|--force-rules-legend]\n" "\t\t[-j|--only-graph]\n" -#: src/rrd_tool.c:164 +#: src/rrd_tool.c:165 msgid "" "\t\t[-n|--font FONTTAG:size:font]\n" "\t\t[-m|--zoom factor]\n" @@ -337,7 +337,7 @@ msgstr "" "\t\t[-Z|--use-nan-for-all-missing-data]\n" "\t\t[DEF:vname=rrd:nom-ds:CF]\n" -#: src/rrd_tool.c:187 +#: src/rrd_tool.c:188 msgid "" "\t\t[CDEF:vname=rpn-expression]\n" "\t\t[VDEF:vdefname=rpn-expression]\n" @@ -371,7 +371,7 @@ msgstr "" "\t\t[GPRINT:nomv:CF:format] (obsolète)\n" "\t\t[STACK:nomv[#rrvvbb[aa][:légende]]] (obsolète)\n" -#: src/rrd_tool.c:202 +#: src/rrd_tool.c:203 msgid "" " * tune - Modify some basic properties of an RRD\n" "\n" @@ -397,7 +397,7 @@ msgstr "" "\t\t[--window-length|-w entier]\n" "\t\t[--alpha|-x paramètre-adaptation]\n" -#: src/rrd_tool.c:213 +#: src/rrd_tool.c:214 msgid "" "\t\t[--beta|-y adaptation-parameter]\n" "\t\t[--gamma|-z adaptation-parameter]\n" @@ -413,7 +413,7 @@ msgstr "" "\t\t[--smoothing-window-deviation|-S fraction-de-fenêtre]\n" "\t\t[--aberrant-reset|-b nom-ds]\n" -#: src/rrd_tool.c:220 +#: src/rrd_tool.c:221 msgid "" "\t\t[--step|-t newstep]\n" "\t\t[--daemon|-D address]\n" @@ -431,7 +431,7 @@ msgstr "" "\t\t[RRA:spec-rra]\n" "\t\t[RRA#indice:[+-=]nombre]\n" -#: src/rrd_tool.c:229 +#: src/rrd_tool.c:230 msgid "" " * resize - alter the length of one of the RRAs in an RRD\n" "\n" @@ -441,7 +441,7 @@ msgstr "" "\n" "\trrdtool resize fichier numrra GROW|SHRINK lignes\n" -#: src/rrd_tool.c:232 +#: src/rrd_tool.c:233 msgid "" "* xport - generate XML dump from one or several RRD\n" "\n" @@ -465,7 +465,7 @@ msgstr "" "\t\t[CDEF:nomv=expression-rpn]\n" "\t\t[XPORT:nomv:légende]\n" -#: src/rrd_tool.c:241 +#: src/rrd_tool.c:242 msgid "" " * quit - closing a session in remote mode\n" "\n" @@ -475,7 +475,7 @@ msgstr "" "\n" "\trrdtool quit\n" -#: src/rrd_tool.c:244 +#: src/rrd_tool.c:245 msgid "" " * ls - lists all *.rrd files in current directory\n" "\n" @@ -485,7 +485,7 @@ msgstr "" "\n" "\trrdtool ls\n" -#: src/rrd_tool.c:247 +#: src/rrd_tool.c:248 msgid "" " * cd - changes the current directory\n" "\n" @@ -495,7 +495,7 @@ msgstr "" "\n" "\trrdtool cd nouveau-répertoire\n" -#: src/rrd_tool.c:250 +#: src/rrd_tool.c:251 msgid "" " * mkdir - creates a new directory\n" "\n" @@ -505,7 +505,7 @@ msgstr "" "\n" "\trrdtool mkdir nom-nouveau-répertoire\n" -#: src/rrd_tool.c:253 +#: src/rrd_tool.c:254 msgid "" " * pwd - returns the current working directory\n" "\n" @@ -515,7 +515,7 @@ msgstr "" "\n" "\trrdtool pwd\n" -#: src/rrd_tool.c:256 +#: src/rrd_tool.c:257 msgid "" "RRDtool is distributed under the Terms of the GNU General\n" "Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n" diff --git a/po/hu.po b/po/hu.po index 1ba35578..0cdd87ca 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rrdtool 1.6.0\n" "Report-Msgid-Bugs-To: https://github.com/oetiker/rrdtool-1.x/issues\n" -"POT-Creation-Date: 2019-02-04 14:32+0100\n" +"POT-Creation-Date: 2019-05-27 18:26+0200\n" "PO-Revision-Date: 2017-04-12 23:09+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" -#: src/rrd_tool.c:48 +#: src/rrd_tool.c:49 #, c-format msgid "" "RRDtool %s Copyright by Tobias Oetiker \n" @@ -31,7 +31,7 @@ msgstr "" "\n" "Használat: rrdtool [kapcsolók] parancs parancs_kapcsolók\n" -#: src/rrd_tool.c:55 +#: src/rrd_tool.c:56 #, fuzzy msgid "" "Valid commands: create, update, updatev, graph, graphv, dump, restore,\n" @@ -42,11 +42,11 @@ msgstr "" "\t\tlast, lastupdate, first, info, fetch, tune\n" "\t\tresize, xport, flushcached\n" -#: src/rrd_tool.c:60 +#: src/rrd_tool.c:61 msgid "Valid remote commands: quit, ls, cd, mkdir, pwd\n" msgstr "Érvényes távoli parancsok: quit, ls, cd, mkdir, pwd\n" -#: src/rrd_tool.c:64 +#: src/rrd_tool.c:65 msgid "" "* create - create a new RRD\n" "\n" @@ -70,7 +70,7 @@ msgstr "" "\t\t[DS:ds-név:DST:dst argumentumok]\n" "\t\t[RRA:CF:cf argumentumok]\n" -#: src/rrd_tool.c:75 +#: src/rrd_tool.c:76 msgid "" "* dump - dump an RRD to XML\n" "\n" @@ -86,7 +86,7 @@ msgstr "" "\t\t[--daemon|-d cím]\n" "\t\tfile.rrd [fájl.xml]" -#: src/rrd_tool.c:82 +#: src/rrd_tool.c:83 msgid "" "* info - returns the configuration and status of the RRD\n" "\n" @@ -96,7 +96,7 @@ msgstr "" "\n" "\trrdtool info [--daemon|-d [--noflush|-F]] fájlnév.rrd\n" -#: src/rrd_tool.c:86 +#: src/rrd_tool.c:87 #, fuzzy msgid "" "* list - returns the list of RRDs\n" @@ -107,7 +107,7 @@ msgstr "" "\n" "\trrdtool info [--daemon|-d [--noflush|-F]] fájlnév.rrd\n" -#: src/rrd_tool.c:90 +#: src/rrd_tool.c:91 msgid "" "* restore - restore an RRD file from its XML form\n" "\n" @@ -119,7 +119,7 @@ msgstr "" "\trrdtool restore [--range-check|-r] [--force-overwrite|-f] fájlnév.xml " "fájlnév.rrd\n" -#: src/rrd_tool.c:94 +#: src/rrd_tool.c:95 msgid "" "* last - show last update time for RRD\n" "\n" @@ -131,7 +131,7 @@ msgstr "" "\trrdtool last fájlnév.rrd\n" "\t\t[--daemon|-d cím]\n" -#: src/rrd_tool.c:99 +#: src/rrd_tool.c:100 msgid "" "* lastupdate - returns the most recent datum stored for\n" " each DS in an RRD\n" @@ -145,7 +145,7 @@ msgstr "" "\trrdtool lastupdate fájlnév.rrd\n" "\t\t[--daemon|-d cím]\n" -#: src/rrd_tool.c:105 +#: src/rrd_tool.c:106 msgid "" "* first - show first update time for RRA within an RRD\n" "\n" @@ -155,7 +155,7 @@ msgstr "" "\n" "\trrdtool first fájlnév.rrd [--rraindex szám] [--daemon|-d cím]\n" -#: src/rrd_tool.c:109 +#: src/rrd_tool.c:110 msgid "" "* update - update an RRD\n" "\n" @@ -181,7 +181,7 @@ msgstr "" "\n" "\t\t[ idő:érték[:érték...] ...]\n" -#: src/rrd_tool.c:119 +#: src/rrd_tool.c:120 msgid "" "* updatev - a verbose version of update\n" "\treturns information about values, RRAs, and datasources updated\n" @@ -207,7 +207,7 @@ msgstr "" "\n" "\t\t[ idő:érték[:érték...] ...]\n" -#: src/rrd_tool.c:129 +#: src/rrd_tool.c:130 msgid "" "* fetch - fetch data out of an RRD\n" "\n" @@ -225,7 +225,7 @@ msgstr "" "\t\t[-a|--align-start]\n" "\t\t[-d|--daemon ]\n" -#: src/rrd_tool.c:137 +#: src/rrd_tool.c:138 msgid "" "* flushcached - flush cached data out to an RRD file\n" "\n" @@ -237,7 +237,7 @@ msgstr "" "\trrdtool flushcached fájlnév.rrd\n" "\t\t[-d|--daemon ]\n" -#: src/rrd_tool.c:144 +#: src/rrd_tool.c:145 msgid "" "* graph - generate a graph from one or several RRD\n" "\n" @@ -247,7 +247,7 @@ msgstr "" "\n" "\trrdtool graph fájlnév [-s|--start másodperc] [-e|--end másodperc]\n" -#: src/rrd_tool.c:147 +#: src/rrd_tool.c:148 msgid "" "* graphv - generate a graph from one or several RRD\n" " with meta data printed before the graph\n" @@ -259,7 +259,7 @@ msgstr "" "\n" "\trrdtool graphv fájlnév [-s|--start másodperc] [-e|--end másodperc]\n" -#: src/rrd_tool.c:151 +#: src/rrd_tool.c:152 msgid "" "\t\t[-x|--x-grid x-axis grid and label]\n" "\t\t[-Y|--alt-y-grid] [--full-size-mode]\n" @@ -289,7 +289,7 @@ msgstr "" "\t\t[-F|--force-rules-legend]\n" "\t\t[-j|--only-graph]\n" -#: src/rrd_tool.c:164 +#: src/rrd_tool.c:165 msgid "" "\t\t[-n|--font FONTTAG:size:font]\n" "\t\t[-m|--zoom factor]\n" @@ -337,7 +337,7 @@ msgstr "" "\t\t[-Z|--use-nan-for-all-missing-data]\n" "\t\t[DEF:vname=rrd:ds-név:CF]\n" -#: src/rrd_tool.c:187 +#: src/rrd_tool.c:188 msgid "" "\t\t[CDEF:vname=rpn-expression]\n" "\t\t[VDEF:vdefname=rpn-expression]\n" @@ -371,7 +371,7 @@ msgstr "" "\t\t[GPRINT:vnév:CF:formátum] (elavult)\n" "\t\t[STACK:vnév[#rrggbb[aa][:jelmagyarázat]]] (elavult)\n" -#: src/rrd_tool.c:202 +#: src/rrd_tool.c:203 msgid "" " * tune - Modify some basic properties of an RRD\n" "\n" @@ -397,7 +397,7 @@ msgstr "" "\t\t[--window-length|-w egész-szám]\n" "\t\t[--alpha|-x adaptáció-paraméter]\n" -#: src/rrd_tool.c:213 +#: src/rrd_tool.c:214 msgid "" "\t\t[--beta|-y adaptation-parameter]\n" "\t\t[--gamma|-z adaptation-parameter]\n" @@ -413,7 +413,7 @@ msgstr "" "\t\t[--smoothing-window-deviation|-S évad-töredéke]\n" "\t\t[--aberrant-reset|-b ds-név]\n" -#: src/rrd_tool.c:220 +#: src/rrd_tool.c:221 msgid "" "\t\t[--step|-t newstep]\n" "\t\t[--daemon|-D address]\n" @@ -431,7 +431,7 @@ msgstr "" "\t\t[RRA:rra-spec]\n" "\t\t[RRA#index:[+-=]szám]\n" -#: src/rrd_tool.c:229 +#: src/rrd_tool.c:230 msgid "" " * resize - alter the length of one of the RRAs in an RRD\n" "\n" @@ -441,7 +441,7 @@ msgstr "" "\n" "\trrdtool resize fájlnév rra-szám GROW|SHRINK sorok\n" -#: src/rrd_tool.c:232 +#: src/rrd_tool.c:233 msgid "" "* xport - generate XML dump from one or several RRD\n" "\n" @@ -465,7 +465,7 @@ msgstr "" "\t\t[CDEF:vnév=rpn-kifejezés]\n" "\t\t[XPORT:vnév:jelmagyarázat]\n" -#: src/rrd_tool.c:241 +#: src/rrd_tool.c:242 msgid "" " * quit - closing a session in remote mode\n" "\n" @@ -475,7 +475,7 @@ msgstr "" "\n" "\trrdtool quit\n" -#: src/rrd_tool.c:244 +#: src/rrd_tool.c:245 msgid "" " * ls - lists all *.rrd files in current directory\n" "\n" @@ -485,7 +485,7 @@ msgstr "" "\n" "\trrdtool ls\n" -#: src/rrd_tool.c:247 +#: src/rrd_tool.c:248 msgid "" " * cd - changes the current directory\n" "\n" @@ -495,7 +495,7 @@ msgstr "" "\n" "\trrdtool cd új-könyvtár\n" -#: src/rrd_tool.c:250 +#: src/rrd_tool.c:251 msgid "" " * mkdir - creates a new directory\n" "\n" @@ -505,7 +505,7 @@ msgstr "" "\n" "\trrdtool mkdir új-könyvtárnév\n" -#: src/rrd_tool.c:253 +#: src/rrd_tool.c:254 msgid "" " * pwd - returns the current working directory\n" "\n" @@ -515,7 +515,7 @@ msgstr "" "\n" "\trrdtool pwd\n" -#: src/rrd_tool.c:256 +#: src/rrd_tool.c:257 msgid "" "RRDtool is distributed under the Terms of the GNU General\n" "Public License Version 2. (www.gnu.org/copyleft/gpl.html)\n" diff --git a/rrdtool-release b/rrdtool-release index caccc92e..6b0dbc07 100755 --- a/rrdtool-release +++ b/rrdtool-release @@ -1,29 +1,16 @@ #!/bin/sh set -e -VERSION=`perl -n -e 'm/\QAC_INIT([rrdtool],[\E(.+?)\Q])\E/ && print $1' configure.ac` +VERSION=`cat VERSION` PERLVERS=`perl -n -e 'm/NUMVERS=(\d+\.\d+)/ && print $1' configure.ac` set -x -perl -i -p -e 's/^\$VERSION.+/\$VERSION='$PERLVERS';/' bindings/perl-*/*.pm -perl -i -p -e 's/RRDtool 1\S+/RRDtool '$VERSION'/ && s/Copyright.+?Oetiker.+\d{4}/Copyright by Tobi Oetiker, 1997-2010/' src/*.h src/*.c +perl -i -p -e 's/^\$VERSION.+/\$VERSION='$VERSION';/' bindings/perl-*/*.pm +perl -i -p -e 's/RRDtool 1\S+/RRDtool '$VERSION'/ && s/Copyright.+?Oetiker.+\d{4}/Copyright by Tobi Oetiker, 1997-2019/' src/*.h src/*.c perl -i -p -e 's/^Version:.+/Version: '$VERSION'/' rrdtool.spec perl -i -p -e 's/rrdtool-[\.\d]+\d(pre\d+)?(rc\d+)?/rrdtool-'$VERSION'/g' doc/rrdbuild.pod -svn diff -echo "Tagging and releasing rrdtool $VERSION ($PERLVERS). Press any Key to continue." -read somekey -svn commit -m "prepare for the release of rrdtool-$VERSION" -OPWD=`pwd` -cd /tmp -svn export svn://svn.oetiker.ch/rrdtool/trunk/program rrdtool-$$ -cd rrdtool-$$ -#svn log --stop-on-copy --xml --verbose svn://svn.oetiker.ch/rrdtool/trunk | \ -# xsltproc --stringparam strip-prefix trunk/program $OPWD/svn2cl.xsl - >CHANGES -sh MakeMakefile -#PKG_CONFIG_PATH=/usr/pack/rrdtool-1.3svn-to/i686-debian-linux3.1/lib/pkgconfig/ -#export PKG_CONFIG_PATH +./bootstrap ./configure --enable-maintainer-mode make dist -# do a test build -tar zxvf rrdtool*.tar.gz +tar zxvf rrdtool-${VERSION}.tar.gz cd rrdtool-$VERSION ./configure make @@ -31,10 +18,7 @@ src/rrdtool cd .. echo READY TO DIST ... press ENTER read x - -scp CHANGES rrdtool*.tar.gz oposs@james:public_html/rrdtool/pub +scp CHANGES rrdtool-$VERSION.tar.gz oposs@james:public_html/rrdtool/pub ssh oposs@james "cd public_html/rrdtool/pub/;rm rrdtool.tar.gz;ln -s rrdtool-$VERSION.tar.gz rrdtool.tar.gz" cd .. -rm -rf rrdtool-$$ -svn copy -m "tagging version $VERSION" svn://svn.oetiker.ch/rrdtool/trunk/program svn://svn.oetiker.ch/rrdtool/tags/$VERSION diff --git a/rrdtool.spec b/rrdtool.spec index 7b3001c2..7625d8a6 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -11,7 +11,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool -Version: 1.GIT +Version: 1.7.2 Release: 1%{?dist} License: GPLv2+ with exceptions Group: Applications/Databases diff --git a/src/Makefile.in b/src/Makefile.in index 438610d8..f9625151 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -102,8 +102,8 @@ target_triplet = @target@ @BUILD_LIBDBI_TRUE@am__append_3 = rrd_fetch_libdbi.c @BUILD_LIBRADOS_TRUE@am__append_4 = rrd_rados.c @BUILD_LIBRADOS_TRUE@am__append_5 = rrd_rados.h -@MINGW_W64_TRUE@am__append_6 = ../win32/win32-glob.c -@MINGW_W64_TRUE@am__append_7 = ../win32/win32-glob.h +@MINGW_W64_TRUE@am__append_6 = ../win32/win32-glob.c strftime.c +@MINGW_W64_TRUE@am__append_7 = ../win32/win32-glob.h strftime.h bin_PROGRAMS = rrdtool$(EXEEXT) rrdupdate$(EXEEXT) $(am__EXEEXT_1) \ $(am__EXEEXT_2) @BUILD_RRDCGI_TRUE@am__append_8 = rrdcgi @@ -163,7 +163,8 @@ am__librrd_la_SOURCES_DIST = rrd_version.c rrd_last.c rrd_lastupdate.c \ rrd_first.c rrd_dump.c rrd_flushcached.c rrd_fetch.c \ rrd_fetch_cb.c rrd_resize.c rrd_tune.c rrd_list.c rrd_graph.c \ rrd_graph_helper.c rrd_xport.c rrd_gfx.c pngsize.c \ - rrd_restore.c rrd_fetch_libdbi.c ../win32/win32-glob.c + rrd_restore.c rrd_fetch_libdbi.c ../win32/win32-glob.c \ + strftime.c @BUILD_RRDGRAPH_TRUE@am__objects_1 = librrd_la-rrd_graph.lo \ @BUILD_RRDGRAPH_TRUE@ librrd_la-rrd_graph_helper.lo \ @BUILD_RRDGRAPH_TRUE@ librrd_la-rrd_xport.lo \ @@ -171,7 +172,8 @@ am__librrd_la_SOURCES_DIST = rrd_version.c rrd_last.c rrd_lastupdate.c \ @BUILD_RRDRESTORE_TRUE@am__objects_2 = librrd_la-rrd_restore.lo @BUILD_LIBDBI_TRUE@am__objects_3 = librrd_la-rrd_fetch_libdbi.lo am__dirstamp = $(am__leading_dot)dirstamp -@MINGW_W64_TRUE@am__objects_4 = ../win32/librrd_la-win32-glob.lo +@MINGW_W64_TRUE@am__objects_4 = ../win32/librrd_la-win32-glob.lo \ +@MINGW_W64_TRUE@ librrd_la-strftime.lo am__objects_5 = librrd_la-rrd_version.lo librrd_la-rrd_last.lo \ librrd_la-rrd_lastupdate.lo librrd_la-rrd_first.lo \ librrd_la-rrd_dump.lo librrd_la-rrd_flushcached.lo \ @@ -278,7 +280,7 @@ am__noinst_HEADERS_DIST = unused.h gettext.h mutex.h rrd_strtod.h \ rrd_rpncalc.h rrd_hw.h rrd_hw_math.h rrd_hw_update.h \ rrd_restore.h rrd_create.h fnv.h rrd_graph.h \ rrd_is_thread_safe.h rrd_modify.h rrd_update.h rrd_config.h \ - quicksort.h rrd_rados.h ../win32/win32-glob.h + quicksort.h rrd_rados.h ../win32/win32-glob.h strftime.h HEADERS = $(include_HEADERS) $(noinst_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)rrd_config.h.in @@ -769,6 +771,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librrd_la-rrd_tune.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librrd_la-rrd_version.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librrd_la-rrd_xport.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librrd_la-strftime.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librrdupd_la-hash_32.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librrdupd_la-mutex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librrdupd_la-optparse.Plo@am__quote@ @@ -955,6 +958,13 @@ librrd_la-rrd_fetch_libdbi.lo: rrd_fetch_libdbi.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_la_CFLAGS) $(CFLAGS) -c -o ../win32/librrd_la-win32-glob.lo `test -f '../win32/win32-glob.c' || echo '$(srcdir)/'`../win32/win32-glob.c +librrd_la-strftime.lo: strftime.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_la_CFLAGS) $(CFLAGS) -MT librrd_la-strftime.lo -MD -MP -MF $(DEPDIR)/librrd_la-strftime.Tpo -c -o librrd_la-strftime.lo `test -f 'strftime.c' || echo '$(srcdir)/'`strftime.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/librrd_la-strftime.Tpo $(DEPDIR)/librrd_la-strftime.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='strftime.c' object='librrd_la-strftime.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrd_la_CFLAGS) $(CFLAGS) -c -o librrd_la-strftime.lo `test -f 'strftime.c' || echo '$(srcdir)/'`strftime.c + librrdupd_la-mutex.lo: mutex.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librrdupd_la_CFLAGS) $(CFLAGS) -MT librrdupd_la-mutex.lo -MD -MP -MF $(DEPDIR)/librrdupd_la-mutex.Tpo -c -o librrdupd_la-mutex.lo `test -f 'mutex.c' || echo '$(srcdir)/'`mutex.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/librrdupd_la-mutex.Tpo $(DEPDIR)/librrdupd_la-mutex.Plo diff --git a/src/pngsize.c b/src/pngsize.c index a6bca75a..14ea6c5f 100644 --- a/src/pngsize.c +++ b/src/pngsize.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * pngsize.c determine the size of a PNG image *****************************************************************************/ diff --git a/src/rrd.h b/src/rrd.h index 1f6199c9..0fd895ae 100644 --- a/src/rrd.h +++ b/src/rrd.h @@ -2,7 +2,7 @@ #define RRDLIB_H_4FD7D37D56A448C392AF46508C56D3CC /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrdlib.h Public header file for librrd ***************************************************************************** @@ -406,9 +406,9 @@ int rrd_proc_start_end( /* * The following functions are _internal_ functions needed to read the raw RRD * files. Since they are _internal_ they may change with the file format and - * will be replaced with a more general interface in RRDtool 1.4. Don't use + * will be replaced with a more general interface in RRDtool 1.7.2 Don't use * these functions unless you have good reasons to do so. If you do use these - * functions you will have to adapt your code for RRDtool 1.4! + * functions you will have to adapt your code for RRDtool 1.7.2 * * To enable the deprecated functions define `RRD_EXPORT_DEPRECATED' before * including . You have been warned! If you come back to the diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c index 91e23f76..8671e3f9 100644 --- a/src/rrd_cgi.c +++ b/src/rrd_cgi.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_cgi.c RRD Web Page Generator *****************************************************************************/ diff --git a/src/rrd_create.c b/src/rrd_create.c index ed3c653b..650eee54 100644 --- a/src/rrd_create.c +++ b/src/rrd_create.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_create.c creates new rrds *****************************************************************************/ diff --git a/src/rrd_create.h b/src/rrd_create.h index 0cfdc0d0..acec9213 100644 --- a/src/rrd_create.h +++ b/src/rrd_create.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_create.h ****************************************************************************/ diff --git a/src/rrd_datalang.c b/src/rrd_datalang.c index 97b69c04..5b5e3250 100644 --- a/src/rrd_datalang.c +++ b/src/rrd_datalang.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_datalang A system for passing named and typed parameters between * the different parts of rrdtool diff --git a/src/rrd_diff.c b/src/rrd_diff.c index 367b9e62..864ff389 100644 --- a/src/rrd_diff.c +++ b/src/rrd_diff.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker * This code is stolen from rateup (mrtg-2.x) by Dave Rand ***************************************************************************** * diff calculate the difference between two very long integers available as diff --git a/src/rrd_dump.c b/src/rrd_dump.c index b17f958e..d833647b 100644 --- a/src/rrd_dump.c +++ b/src/rrd_dump.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_dump Display a RRD ***************************************************************************** diff --git a/src/rrd_error.c b/src/rrd_error.c index 4426b6d5..46ae2fba 100644 --- a/src/rrd_error.c +++ b/src/rrd_error.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_error.c Common Header File ***************************************************************************** diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c index 55da4a32..c387d94c 100644 --- a/src/rrd_fetch.c +++ b/src/rrd_fetch.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_fetch.c read date from an rrd to use for further processing ***************************************************************************** diff --git a/src/rrd_first.c b/src/rrd_first.c index bc99cb4b..d28a1048 100644 --- a/src/rrd_first.c +++ b/src/rrd_first.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_first Return ***************************************************************************** diff --git a/src/rrd_format.c b/src/rrd_format.c index 678ffc3d..7289060c 100644 --- a/src/rrd_format.c +++ b/src/rrd_format.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_format.c RRD Database Format helper functions *****************************************************************************/ diff --git a/src/rrd_format.h b/src/rrd_format.h index 5d0464b8..d9b019bd 100644 --- a/src/rrd_format.h +++ b/src/rrd_format.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_format.h RRD Database Format header *****************************************************************************/ diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c index a8446eb3..dc5ea04a 100644 --- a/src/rrd_gfx.c +++ b/src/rrd_gfx.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_gfx.c graphics wrapper for rrdtool **************************************************************************/ diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 2b3bc445..d21415e7 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd__graph.c produce graphs from data in rrdfiles ****************************************************************************/ diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c index bbb470ab..5632e67a 100644 --- a/src/rrd_graph_helper.c +++ b/src/rrd_graph_helper.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_graph_helper.c commandline parser functions * this code initially written by Alex van den Bogaerdt diff --git a/src/rrd_hw.c b/src/rrd_hw.c index bc919ac4..145d935f 100644 --- a/src/rrd_hw.c +++ b/src/rrd_hw.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_hw.c : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection ***************************************************************************** diff --git a/src/rrd_hw.h b/src/rrd_hw.h index 21116c1b..4d9b98eb 100644 --- a/src/rrd_hw.h +++ b/src/rrd_hw.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_hw.h : Support for Holt-Winters Smoothing/ Aberrant Behavior Detection *****************************************************************************/ diff --git a/src/rrd_i18n.h b/src/rrd_i18n.h index 210b8cb1..d2e17628 100644 --- a/src/rrd_i18n.h +++ b/src/rrd_i18n.h @@ -2,7 +2,7 @@ #define RRD_I18N_H_E9D8F44A32654DF9B92B1862D5371142 /***************************************************************************** - * RRDtool 1.4.3 Copyright by Takao Fujiwara, 2008 + * RRDtool 1.7.2 Copyright by Takao Fujiwara, 2008 ***************************************************************************** * rrd_i18n.h Common Header File *****************************************************************************/ diff --git a/src/rrd_info.c b/src/rrd_info.c index 8d2a01a5..13674d51 100644 --- a/src/rrd_info.c +++ b/src/rrd_info.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_info Get Information about the configuration of an RRD *****************************************************************************/ diff --git a/src/rrd_is_thread_safe.h b/src/rrd_is_thread_safe.h index 27644548..3bc508d2 100644 --- a/src/rrd_is_thread_safe.h +++ b/src/rrd_is_thread_safe.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker * This file: Copyright 2003 Peter Stamfest * & Tobias Oetiker * Distributed under the GPL diff --git a/src/rrd_last.c b/src/rrd_last.c index 0e3d9a74..2a9b8680 100644 --- a/src/rrd_last.c +++ b/src/rrd_last.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_last.c ***************************************************************************** diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c index cca91029..0276d29f 100644 --- a/src/rrd_lastupdate.c +++ b/src/rrd_lastupdate.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker * Copyright by Florian Forster, 2008 ***************************************************************************** * rrd_lastupdate Get the last datum entered for each DS diff --git a/src/rrd_modify.c b/src/rrd_modify.c index c4037ec0..8b577843 100644 --- a/src/rrd_modify.c +++ b/src/rrd_modify.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_modify Structurally modify an RRD file * (c) 2014 by Peter Stamfest and Tobi Oetiker diff --git a/src/rrd_modify.h b/src/rrd_modify.h index 852fe8a2..da0fa4f5 100644 --- a/src/rrd_modify.h +++ b/src/rrd_modify.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_create.h ****************************************************************************/ diff --git a/src/rrd_open.c b/src/rrd_open.c index 7a30a79e..058c730a 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_open.c Open an RRD File ***************************************************************************** diff --git a/src/rrd_resize.c b/src/rrd_resize.c index 03b7938c..8c269b0e 100644 --- a/src/rrd_resize.c +++ b/src/rrd_resize.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_resize.c Alters size of an RRA ***************************************************************************** diff --git a/src/rrd_restore.c b/src/rrd_restore.c index b4df93cd..da176e6e 100644 --- a/src/rrd_restore.c +++ b/src/rrd_restore.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_restore.c Contains logic to parse XML input and create an RRD file * This file: diff --git a/src/rrd_restore.h b/src/rrd_restore.h index aed47960..41232d7b 100644 --- a/src/rrd_restore.h +++ b/src/rrd_restore.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_restore.h ****************************************************************************/ diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c index e3e5fd25..67743306 100644 --- a/src/rrd_rpncalc.c +++ b/src/rrd_rpncalc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_rpncalc.c RPN calculator functions ****************************************************************************/ diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h index 972bc600..ed89eb40 100644 --- a/src/rrd_rpncalc.h +++ b/src/rrd_rpncalc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_rpncalc.h RPN calculator functions ****************************************************************************/ diff --git a/src/rrd_snprintf.c b/src/rrd_snprintf.c index 6f36a9dc..e4220cbf 100644 --- a/src/rrd_snprintf.c +++ b/src/rrd_snprintf.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_snprintf ****************************************************************************/ diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c index 6f83d39a..dba7b6cc 100644 --- a/src/rrd_thread_safe.c +++ b/src/rrd_thread_safe.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker * This file: Copyright 2003 Peter Stamfest * & Tobias Oetiker * Distributed under the GPL diff --git a/src/rrd_thread_safe_nt.c b/src/rrd_thread_safe_nt.c index d6576a77..7bf5f4b1 100644 --- a/src/rrd_thread_safe_nt.c +++ b/src/rrd_thread_safe_nt.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker * This file: Copyright 2003 Peter Stamfest * & Tobias Oetiker * Distributed under the GPL diff --git a/src/rrd_tool.c b/src/rrd_tool.c index f7676091..bbf458be 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_tool.c Startup wrapper *****************************************************************************/ diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 52a52854..e58f04d9 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -2,7 +2,7 @@ #define RRD_TOOL_H_3853987DDF7E4709A5B5849E5A6204F4 /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_tool.h Common Header File *****************************************************************************/ diff --git a/src/rrd_tune.c b/src/rrd_tune.c index 559b94c2..6a76da88 100644 --- a/src/rrd_tune.c +++ b/src/rrd_tune.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * change header parameters of an rrd ***************************************************************************** diff --git a/src/rrd_update.c b/src/rrd_update.c index 4065da58..af5c99e0 100644 --- a/src/rrd_update.c +++ b/src/rrd_update.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker * Copyright by Florian Forster, 2008 ***************************************************************************** * rrd_update.c RRD Update Function diff --git a/src/rrd_update.h b/src/rrd_update.h index f55e807b..88b7ce16 100644 --- a/src/rrd_update.h +++ b/src/rrd_update.h @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_restore.h ****************************************************************************/ diff --git a/src/rrd_version.c b/src/rrd_version.c index 734e18d1..f930eba6 100644 --- a/src/rrd_version.c +++ b/src/rrd_version.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrd_version Return ***************************************************************************** diff --git a/src/rrd_xport.c b/src/rrd_xport.c index 3a402a4f..04a449c4 100644 --- a/src/rrd_xport.c +++ b/src/rrd_xport.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_xport.c export RRD data ****************************************************************************/ diff --git a/src/rrd_xport.h b/src/rrd_xport.h index 2803cda2..feda084b 100644 --- a/src/rrd_xport.h +++ b/src/rrd_xport.h @@ -2,7 +2,7 @@ #define RRD_XPORT_H_C5A7EBAF331140D38C241326B81F357D /**************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker **************************************************************************** * rrd_xport.h contains XML related constants ****************************************************************************/ diff --git a/src/rrdupdate.c b/src/rrdupdate.c index 96636ad1..05c9bdd1 100644 --- a/src/rrdupdate.c +++ b/src/rrdupdate.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.GIT, Copyright by Tobi Oetiker + * RRDtool 1.7.2 Copyright by Tobi Oetiker ***************************************************************************** * rrdupdate.c Main program for the (standalone) rrdupdate utility ***************************************************************************** diff --git a/tests/Makefile.in b/tests/Makefile.in index 40d4befd..850c26b0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -543,7 +543,7 @@ TESTS = modify1 modify2 modify3 modify4 modify5 \ create-with-source-1 create-with-source-2 create-with-source-3 \ create-with-source-4 create-with-source-and-mapping-1 \ create-from-template-1 dcounter1 vformatter1 xport1 list1 \ - pdp-calc1 + pdp-calc1 EXTRA_DIST = Makefile.am \ functions $(TESTS) \ @@ -557,7 +557,7 @@ EXTRA_DIST = Makefile.am \ tune2-testa-mod1.dump tune2-testorg.dump \ valgrind-supressions dcounter1 dcounter1.output graph1.output vformatter1 rpn1.output rpn2.output \ xport1.json.output xport1.xml.output \ - pdp-calc1 pdp-calc1-1-avg-60.output pdp-calc1-1-avg-300.output pdp-calc1-1-max-300.output + pdp-calc1 pdp-calc1-1-avg-60.output pdp-calc1-1-avg-300.output pdp-calc1-1-max-300.output # NB: AM_TESTS_ENVIRONMENT not available until automake 1.12 @@ -891,13 +891,6 @@ dcounter1.log: dcounter1 --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -pdp-calc1.log: pdp-calc1 - @p='pdp-calc1'; \ - b='pdp-calc1'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) vformatter1.log: vformatter1 @p='vformatter1'; \ b='vformatter1'; \ @@ -919,6 +912,13 @@ list1.log: list1 --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +pdp-calc1.log: pdp-calc1 + @p='pdp-calc1'; \ + b='pdp-calc1'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) .test.log: @p='$<'; \ $(am__set_b); \