projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
using --riggid it is possible to get a case where minval is bigger than maxval ....
[rrdtool.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
18d16a0
..
58b71c1
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-4,35
+4,35
@@
#
#ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4
#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
#
#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
if USE_INSTALLED_libcgi
CGI_LIB = -lcgi
else
-CGI_LIB = $(top_
src
dir)/libraries/@CGI_LIB_DIR@/librrd_cgi.la
+CGI_LIB = $(top_
build
dir)/libraries/@CGI_LIB_DIR@/librrd_cgi.la
CGI_INCLUDES = -I$(top_srcdir)/libraries/@CGI_LIB_DIR@
endif
if USE_INSTALLED_libfreetype
FREETYPE_LIB = -lfreetype
else
CGI_INCLUDES = -I$(top_srcdir)/libraries/@CGI_LIB_DIR@
endif
if USE_INSTALLED_libfreetype
FREETYPE_LIB = -lfreetype
else
-FREETYPE_LIB = $(top_
src
dir)/libraries/@FREETYPE_LIB_DIR@/librrd_freetype.la
+FREETYPE_LIB = $(top_
build
dir)/libraries/@FREETYPE_LIB_DIR@/librrd_freetype.la
FREETYPE_INCLUDES = -I$(top_srcdir)/libraries/@FREETYPE_LIB_DIR@/include
endif
if USE_INSTALLED_libart_lgpl
ART_LIB = -lart_lgpl
else
FREETYPE_INCLUDES = -I$(top_srcdir)/libraries/@FREETYPE_LIB_DIR@/include
endif
if USE_INSTALLED_libart_lgpl
ART_LIB = -lart_lgpl
else
-ART_LIB = $(top_
src
dir)/libraries/@ART_LIB_DIR@/librrd_art.la
-ART_INCLUDES = -I$(top_srcdir)/libraries/@ART_LIB_DIR@
+ART_LIB = $(top_
build
dir)/libraries/@ART_LIB_DIR@/librrd_art.la
+ART_INCLUDES = -I$(top_srcdir)/libraries/@ART_LIB_DIR@
-I$(top_builddir)/libraries/@ART_LIB_DIR@
endif
if USE_INSTALLED_libpng
PNG_LIB = -lpng
else
endif
if USE_INSTALLED_libpng
PNG_LIB = -lpng
else
-PNG_LIB = $(top_
src
dir)/libraries/@PNG_LIB_DIR@/librrd_png.la
+PNG_LIB = $(top_
build
dir)/libraries/@PNG_LIB_DIR@/librrd_png.la
PNG_INCLUDES = -I$(top_srcdir)/libraries/@PNG_LIB_DIR@
endif
if USE_INSTALLED_libz
ZLIB_LIB = -lz
else
PNG_INCLUDES = -I$(top_srcdir)/libraries/@PNG_LIB_DIR@
endif
if USE_INSTALLED_libz
ZLIB_LIB = -lz
else
-ZLIB_LIB = $(top_
src
dir)/libraries/@ZLIB_LIB_DIR@/librrd_z.la
+ZLIB_LIB = $(top_
build
dir)/libraries/@ZLIB_LIB_DIR@/librrd_z.la
ZLIB_INCLUDES = -I$(top_srcdir)/libraries/@ZLIB_LIB_DIR@
endif
ZLIB_INCLUDES = -I$(top_srcdir)/libraries/@ZLIB_LIB_DIR@
endif
@@
-42,7
+42,6
@@
INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
RRD_C_FILES = \
getopt.c \
getopt1.c \
RRD_C_FILES = \
getopt.c \
getopt1.c \
- gifsize.c \
parsetime.c \
hash_32.c \
rrd_hw.c \
parsetime.c \
hash_32.c \
rrd_hw.c \
@@
-63,8
+62,15
@@
RRD_C_FILES = \
rrd_rpncalc.c \
rrd_tune.c \
rrd_update.c \
rrd_rpncalc.c \
rrd_tune.c \
rrd_update.c \
+ rrd_xport.c \
+ rrd_nan_inf.c \
rrd_gfx.c rrd_gfx.h \
rrd_gfx.c rrd_gfx.h \
- getopt.h ntconfig.h parsetime.h rrd_format.h rrd_tool.h rrd.h rrd_hw.h rrd_rpncalc.h
+ 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 \
+ rrd_is_thread_safe.h
# Build two libraries. One is a public one that gets installed in
# $prefix/lib. Libtool does not create an archive of the PIC compiled
# Build two libraries. One is a public one that gets installed in
# $prefix/lib. Libtool does not create an archive of the PIC compiled
@@
-80,15
+86,20
@@
RRD_LIBS = \
$(PNG_LIB) \
$(ZLIB_LIB)
$(PNG_LIB) \
$(ZLIB_LIB)
-lib_LTLIBRARIES = librrd.la
+lib_LTLIBRARIES = librrd.la
librrd_th.la
noinst_LTLIBRARIES = librrd_private.la
noinst_LTLIBRARIES = librrd_private.la
-librrd_la_SOURCES = $(RRD_C_FILES)
-librrd_private_la_SOURCES = $(RRD_C_FILES)
+librrd_la_SOURCES = $(RRD_C_FILES)
rrd_not_thread_safe.c
+librrd_private_la_SOURCES = $(RRD_C_FILES)
rrd_not_thread_safe.c
librrd_la_LIBADD = $(RRD_LIBS)
librrd_la_LDFLAGS = -version-info 1:2:0
librrd_la_LIBADD = $(RRD_LIBS)
librrd_la_LDFLAGS = -version-info 1:2:0
+librrd_th_la_SOURCES = $(RRD_C_FILES) rrd_thread_safe.c
+librrd_th_la_LIBADD = $(RRD_LIBS) -lpthread
+librrd_th_la_LDFLAGS = -version-info 1:2:0
+
+
include_HEADERS = rrd.h
librrd_private_la_LIBADD = $(RRD_LIBS)
include_HEADERS = rrd.h
librrd_private_la_LIBADD = $(RRD_LIBS)
@@
-102,14
+113,14
@@
rrdcgi_LDADD = librrd.la
rrdupdate_SOURCES =
rrdupdate_LDADD = rrdupdate.o librrd.la
rrdupdate_SOURCES =
rrdupdate_LDADD = rrdupdate.o librrd.la
+# rrdupdate.c: rrd_update.c
+# -ln -s ${srcdir}/rrdupdate.c rrd_update.c
-rrdupdate.c: rrd_update.c
- -ln -s rrd_update.c rrdupdate.c
-
-rrdupdate.o: rrdupdate.c
- $(COMPILE) -DSTANDALONE -c rrdupdate.c
+rrdupdate.o: rrd_update.c
+ $(COMPILE) -DSTANDALONE -c -o $@ $^
-rrdtool_SOURCES = rrd_tool.c
+rrdtool_SOURCES =
+rrdtool_DEPENDENCIES = rrd_tool.o
rrdtool_LDADD = librrd.la
EXTRA_DIST= rrdtool.dsp rrdtool.dsw
rrdtool_LDADD = librrd.la
EXTRA_DIST= rrdtool.dsp rrdtool.dsw