projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I finally finished the first version of the patch (attached) -- Fidelis Assis fideli...
[rrdtool.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
daaacb6
..
420aeab
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-14,9
+14,7
@@
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 \
- parsetime.c \
+ rrd_parsetime.c \
rrd_hw.c \
rrd_hw_math.c \
rrd_hw_update.c \
rrd_hw.c \
rrd_hw_math.c \
rrd_hw_update.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,20
+42,25
@@
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_fetch.c \
- rrd_tool.c \
rrd_resize.c \
rrd_tune.c
noinst_HEADERS = \
unused.h \
rrd_resize.c \
rrd_tune.c
noinst_HEADERS = \
unused.h \
- rrd_getopt.h parsetime.h \
- rrd_i18n.h \
+ rrd_getopt.h
rrd_
parsetime.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
@@
-68,20
+72,21
@@
librrdupd_la_SOURCES = $(UPD_C_FILES) rrd_not_thread_safe.c
librrdupd_la_LIBADD = $(CORE_LIBS) @LIB_LIBINTL@
librrd_la_SOURCES = $(RRD_C_FILES)
librrdupd_la_LIBADD = $(CORE_LIBS) @LIB_LIBINTL@
librrd_la_SOURCES = $(RRD_C_FILES)
+librrd_la_DEPENDENCIES = librrdupd.la librrd.sym
librrd_la_LIBADD = librrdupd.la $(ALL_LIBS)
librrd_la_LIBADD = librrdupd.la $(ALL_LIBS)
-
-# see http://sourceware.org/autobook/autobook/autobook_91.html
-
librrd_la_LDFLAGS = -version-info @LIBVERS@
librrd_la_LDFLAGS = -version-info @LIBVERS@
+librrd_la_LDFLAGS += -export-symbols librrd.sym
librrd_th_la_SOURCES = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
librrd_th_la_SOURCES = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
+librrd_th_la_DEPENDENCIES = librrd.sym
librrd_th_la_CFLAGS = $(MULTITHREAD_CFLAGS)
librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@
librrd_th_la_CFLAGS = $(MULTITHREAD_CFLAGS)
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_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
@@
-93,12
+98,17
@@
rrdcgi_LDADD = librrd.la
rrdupdate_SOURCES = rrdupdate.c
rrdupdate_LDADD = librrdupd.la
rrdupdate_SOURCES = rrdupdate.c
rrdupdate_LDADD = librrdupd.la
-rrdtool_SOURCES =
-rrdtool_DEPENDENCIES =
rrd_tool.o
librrd.la
+rrdtool_SOURCES =
rrd_tool.c
+rrdtool_DEPENDENCIES = librrd.la
rrdtool_LDADD = 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 \
- win32comp.c rrd_thread_safe_nt.c get_ver.awk
+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