projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
did not pick up all the changes for rrdcached in the first round ... so here is the...
[rrdtool.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
4f19be5
..
420aeab
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-14,8
+14,6
@@
RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
UPD_C_FILES = \
AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
UPD_C_FILES = \
- rrd_getopt.c \
- rrd_getopt1.c \
rrd_parsetime.c \
rrd_hw.c \
rrd_hw_math.c \
rrd_parsetime.c \
rrd_hw.c \
rrd_hw_math.c \
@@
-25,6
+23,7
@@
UPD_C_FILES = \
rrd_info.c \
rrd_error.c \
rrd_open.c \
rrd_info.c \
rrd_error.c \
rrd_open.c \
+ rrd_client.c \
rrd_nan_inf.c \
rrd_rpncalc.c \
rrd_update.c
rrd_nan_inf.c \
rrd_rpncalc.c \
rrd_update.c
@@
-43,6
+42,7
@@
RRD_C_FILES = \
rrd_xport.c \
rrd_gfx.c \
rrd_dump.c \
rrd_xport.c \
rrd_gfx.c \
rrd_dump.c \
+ rrd_flush.c \
rrd_fetch.c \
rrd_resize.c \
rrd_tune.c
rrd_fetch.c \
rrd_resize.c \
rrd_tune.c
@@
-50,12
+50,17
@@
RRD_C_FILES = \
noinst_HEADERS = \
unused.h \
rrd_getopt.h rrd_parsetime.h \
noinst_HEADERS = \
unused.h \
rrd_getopt.h rrd_parsetime.h \
- rrd_i18n.h \
+ rrd_
config_bottom.h rrd_
i18n.h \
rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h \
rrd_hw.h rrd_hw_math.h rrd_hw_update.h \
fnv.h rrd_graph.h \
rrd_is_thread_safe.h
rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h \
rrd_hw.h rrd_hw_math.h rrd_hw_update.h \
fnv.h rrd_graph.h \
rrd_is_thread_safe.h
+if BUILD_GETOPT
+noinst_HEADERS += rrd_getopt.h
+UPD_C_FILES += rrd_getopt.c rrd_getopt1.c
+endif
+
noinst_LTLIBRARIES = librrdupd.la
lib_LTLIBRARIES = librrd.la
noinst_LTLIBRARIES = librrdupd.la
lib_LTLIBRARIES = librrd.la
@@
-79,9
+84,9
@@
librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@
librrd_th_la_LDFLAGS += -export-symbols librrd.sym
librrd_th_la_LIBADD = $(ALL_LIBS)
librrd_th_la_LDFLAGS += -export-symbols librrd.sym
librrd_th_la_LIBADD = $(ALL_LIBS)
-include_HEADERS = rrd.h
+include_HEADERS = rrd.h
rrd_format.h rrd_client.h
-bin_PROGRAMS = rrdtool rrdupdate
+bin_PROGRAMS = rrdtool rrdupdate
rrdcached
if BUILD_RRDCGI
bin_PROGRAMS += rrdcgi
if BUILD_RRDCGI
bin_PROGRAMS += rrdcgi
@@
-97,8
+102,13
@@
rrdtool_SOURCES = rrd_tool.c
rrdtool_DEPENDENCIES = librrd.la
rrdtool_LDADD = librrd.la
rrdtool_DEPENDENCIES = librrd.la
rrdtool_LDADD = librrd.la
+rrdcached_SOURCES = rrd_daemon.c
+rrdcached_DEPENDENCIES = librrd.la
+rrdcached_CPPFLAGS = -DVERSION='"$(VERSION)"' -DLOCALSTATEDIR='"$(localstatedir)"'
+rrdcached_LDADD = librrd.la
+
# strftime is here because we do not usually need it. unices have propper
# iso date support
# strftime is here because we do not usually need it. unices have propper
# iso date support
-EXTRA_DIST= strftime.c strftime.h \
+EXTRA_DIST= strftime.c strftime.h
rrd_getopt.c rrd_getopt1.c rrd_getopt.h
\
win32comp.c rrd_thread_safe_nt.c get_ver.awk librrd.sym
win32comp.c rrd_thread_safe_nt.c get_ver.awk librrd.sym