From b48f8f963467ce3e608e286c6dff08b54e05bcef Mon Sep 17 00:00:00 2001 From: oetiker Date: Thu, 20 Feb 2003 21:27:48 +0000 Subject: [PATCH] updated copyrigh dates removed error.h from threaded variant added compiletime to rrdtool git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@183 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/Makefile.am | 7 ++++--- src/rrd_thread_safe.c | 2 +- src/rrd_tool.c | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f7965b1..4bf66ac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ # #ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config - +DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\" if USE_INSTALLED_libcgi CGI_LIB = -lcgi else @@ -68,6 +68,7 @@ RRD_C_FILES = \ rrd_afm.c rrd_afm_data.c \ getopt.h ntconfig.h parsetime.h \ rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_hw.h rrd_rpncalc.h \ + rrd_tool.c \ rrd_nan_inf.h fnv.h rrd_graph.h rrd_afm.h rrd_afm_data.h # Build two libraries. One is a public one that gets installed in @@ -111,14 +112,14 @@ rrdcgi_LDADD = librrd.la rrdupdate_SOURCES = rrdupdate_LDADD = rrdupdate.o librrd.la - rrdupdate.c: rrd_update.c -ln -s rrd_update.c rrdupdate.c rrdupdate.o: rrdupdate.c $(COMPILE) -DSTANDALONE -c rrdupdate.c -rrdtool_SOURCES = rrd_tool.c +rrdtool_SOURCES = +rrdtool_DEPENDENCIES = rrd_tool.o rrdtool_LDADD = librrd.la EXTRA_DIST= rrdtool.dsp rrdtool.dsw diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c index 223b586..5b8ffaf 100644 --- a/src/rrd_thread_safe.c +++ b/src/rrd_thread_safe.c @@ -11,7 +11,7 @@ #include #include -#include +/* #include */ #include "rrd.h" #include "rrd_tool.h" diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 5fcb440..1795c84 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -22,7 +22,8 @@ void PrintUsage(char *cmd) { char help_main[] = - "RRDtool 1.1.x Copyright 1997-2001 by Tobias Oetiker \n\n" + "RRDtool 1.1.x Copyright 1997-2003 by Tobias Oetiker \n" + " Compiled " MAKE_TIMESTAMP "\n\n" "Usage: rrdtool [options] command command_options\n\n"; char help_list[] = @@ -497,7 +498,7 @@ int HandleInputLine(int argc, char **argv, FILE* out) strcmp("v", argv[1]) == 0 || strcmp("-v", argv[1]) == 0 || strcmp("-version", argv[1]) == 0 ) - printf("RRDtool 1.1.x Copyright (C) 1997-2001 by Tobias Oetiker \n"); + printf("RRDtool 1.1.x Copyright (C) 1997-2003 by Tobias Oetiker \n"); else if (strcmp("restore", argv[1]) == 0) rrd_restore(argc-1, &argv[1]); else if (strcmp("resize", argv[1]) == 0) -- 2.11.0