updated copyrigh dates

removed error.h from threaded variant
added compiletime to rrdtool

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@183 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/Makefile.am b/program/src/Makefile.am
index f7965b15e2324ec1f62342ca11d37a3e244ebbdb..4bf66ace4e68a65e6a3cdf2c13e148e1724198f7 100644 (file)
--- a/program/src/Makefile.am
+++ b/program/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/program/src/rrd_thread_safe.c b/program/src/rrd_thread_safe.c
index 223b586735695501819b4af39927c5a5f33471f3..5b8ffafaf4c8deed2ce8e72497ef809d71577c69 100644 (file)
--- a/program/src/rrd_thread_safe.c
+++ b/program/src/rrd_thread_safe.c
@@ -11,7 +11,7 @@
 
 #include <pthread.h>
 #include <string.h>
-#include <error.h>
+/* #include <error.h> */
 #include "rrd.h"
 #include "rrd_tool.h"
 

diff --git a/program/src/rrd_tool.c b/program/src/rrd_tool.c
index 5fcb4404e3a369c0305cde7e87653b34dbab8c93..1795c8458d6934b70a406b40b8c5850567c61c91 100644 (file)
--- a/program/src/rrd_tool.c
+++ b/program/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 <tobi@oetiker.ch>\n\n"
+          "RRDtool 1.1.x  Copyright 1997-2003 by Tobias Oetiker <tobi@oetiker.ch>\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 <tobi@oetiker.ch>\n");
+        printf("RRDtool 1.1.x  Copyright (C) 1997-2003 by Tobias Oetiker <tobi@oetiker.ch>\n");
     else if (strcmp("restore", argv[1]) == 0)
        rrd_restore(argc-1, &argv[1]);
     else if (strcmp("resize", argv[1]) == 0)