make rrdupdate realy light as it was intended in the first place -- Peter Breitenlohn...

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@900 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/Makefile.am b/src/Makefile.am
index 1612608a6858678f7d356f3cdf6875ce70a6d82c..fde9585dfdb7f2905f40cb48d2d0e31941319533 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,55 +12,61 @@ fonts_DATA = DejaVuSansMono-Roman.ttf
 RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
 AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
 
+UPD_C_FILES =          \
+       parsetime.c     \
+       rrd_hw.c        \
+       rrd_diff.c      \
+       rrd_format.c    \
+       rrd_info.c      \
+       rrd_error.c     \
+       rrd_open.c      \
+       rrd_nan_inf.c   \
+       rrd_rpncalc.c   \
+       rrd_update.c
+
 RRD_C_FILES =          \
        getopt.c        \
        getopt1.c       \
-       parsetime.c     \
        hash_32.c       \
-       rrd_hw.c        \
        pngsize.c       \
        rrd_create.c    \
-       rrd_diff.c      \
        rrd_dump.c      \
-       rrd_info.c      \
-       rrd_error.c     \
        rrd_fetch.c     \
-       rrd_format.c    \
        rrd_graph.c     \
        rrd_graph_helper.c      \
        rrd_last.c      \
        rrd_first.c     \
-       rrd_open.c      \
        rrd_resize.c    \
        rrd_restore.c   \
-       rrd_rpncalc.c \
        rrd_tune.c      \
-       rrd_update.c    \
        rrd_version.c   \
        rrd_xport.c     \
-       rrd_nan_inf.c   \
         art_rgba_svp.c \
+       rrd_gfx.c \
+       rrd_afm.c rrd_afm_data.c \
+       rrd_tool.c
+
+noinst_HEADERS = \
         art_rgba_svp.h \
        unused.h \
-       rrd_gfx.c rrd_gfx.h \
-       rrd_afm.c rrd_afm_data.c \
+       rrd_gfx.h \
        getopt.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 \
        rrd_is_thread_safe.h
 
+noinst_LTLIBRARIES        = librrdupd.la
+
 lib_LTLIBRARIES           = librrd.la 
 if BUILD_MULTITHREAD
 lib_LTLIBRARIES           += librrd_th.la
 endif
 
-#noinst_LTLIBRARIES        = librrd_private.la
-
-librrd_la_SOURCES         = $(RRD_C_FILES) rrd_not_thread_safe.c
-#librrd_private_la_SOURCES = $(RRD_C_FILES) rrd_not_thread_safe.c
+librrdupd_la_SOURCES      = $(UPD_C_FILES) rrd_not_thread_safe.c
+librrdupd_la_LIBADD       = $(CORE_LIBS)
 
-# librrd_la_LIBADD          = $(RRD_LIBS)
+librrd_la_SOURCES         = $(RRD_C_FILES)
+librrd_la_LIBADD          = librrdupd.la $(ALL_LIBS)
 
 # This flag accepts an argument of the form current[:revision[:age]]. So,
 # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to 1.
@@ -97,16 +103,13 @@ librrd_la_SOURCES         = $(RRD_C_FILES) rrd_not_thread_safe.c
 # see http://www.gnu.org/software/libtool/manual.html#SEC32 for explanation
 librrd_la_LDFLAGS         = -version-info 2:8:0
 
-librrd_th_la_SOURCES         = $(RRD_C_FILES) rrd_thread_safe.c
+librrd_th_la_SOURCES         = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
 librrd_th_la_CFLAGS          = $(MULTITHREAD_CFLAGS)
 librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:8:0
-
+librrd_th_la_LIBADD          = $(ALL_LIBS)
 
 include_HEADERS        = rrd.h
 
-#librrd_private_la_LIBADD  = $(RRD_LIBS)
-#librrd_private_la_LDFLAGS = -static
-
 bin_PROGRAMS   = rrdtool rrdupdate
 
 if BUILD_RRDCGI
@@ -116,14 +119,8 @@ endif
 rrdcgi_SOURCES = rrd_cgi.c
 rrdcgi_LDADD   = librrd.la
 
-rrdupdate_SOURCES = 
-rrdupdate_LDADD        = rrdupdate.o librrd.la
-
-# rrdupdate.c: rrd_update.c
-#      -ln -s ${srcdir}/rrdupdate.c rrd_update.c
-
-rrdupdate.o: rrd_update.c
-       $(COMPILE) -DSTANDALONE -c -o $@ $^
+rrdupdate_SOURCES = rrdupdate.c
+rrdupdate_LDADD          = librrdupd.la
 
 rrdtool_SOURCES = 
 rrdtool_DEPENDENCIES = rrd_tool.o librrd.la

diff --git a/src/rrd_update.c b/src/rrd_update.c
index 560ba763a2428da587157e07f3d2cf24e2667622..9d7d251e3eccdd65e442d1d1de67f11b3d30244e 100644 (file)
--- a/src/rrd_update.c
+++ b/src/rrd_update.c
@@ -94,26 +94,6 @@ int _rrd_update(char *filename, char *tmplt, int argc, char **argv,
 #define IFDNAN(X,Y) (isnan(X) ? (Y) : (X));
 
 
-#ifdef STANDALONE
-int 
-main(int argc, char **argv){
-        rrd_update(argc,argv);
-        if (rrd_test_error()) {
-                printf("RRDtool " PACKAGE_VERSION "  Copyright by Tobi Oetiker, 1997-2005\n\n"
-                        "Usage: rrdupdate filename\n"
-                        "\t\t\t[--template|-t ds-name:ds-name:...]\n"
-                        "\t\t\ttime|N:value[:value...]\n\n"
-                        "\t\t\tat-time@value[:value...]\n\n"
-                        "\t\t\t[ time:value[:value...] ..]\n\n");
-                                   
-                printf("ERROR: %s\n",rrd_get_error());
-                rrd_clear_error();                                                            
-                return 1;
-        }
-        return 0;
-}
-#endif
-
 info_t *rrd_update_v(int argc, char **argv)
 {
     char             *tmplt = NULL;