projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into ff/rrdd
[rrdtool.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
ea4cb20
..
663d1a1
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 \
@@
-44,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
@@
-57,6
+56,11
@@
noinst_HEADERS = \
fnv.h rrd_graph.h \
rrd_is_thread_safe.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
@@
-105,6
+109,6
@@
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