projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare for the release of rrdtool-1.2.14
[rrdtool.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
14dd3bc
..
1612608
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-4,14
+4,13
@@
#
#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)"\"
fontsdir = $(datadir)/rrdtool/fonts
fonts_DATA = DejaVuSansMono-Roman.ttf
fontsdir = $(datadir)/rrdtool/fonts
fonts_DATA = DejaVuSansMono-Roman.ttf
-#INCLUDES = $(
CGI_INCLUDES) $(
FREETYPE_INCLUDES) $(ART_INCLUDES) \
+#INCLUDES = $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
# $(PNG_INCLUDES) $(ZLIB_INCLUDES)
RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
# $(PNG_INCLUDES) $(ZLIB_INCLUDES)
RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
-AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\"
+AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\"
-DNUMVERS=@NUMVERS@
RRD_C_FILES = \
getopt.c \
RRD_C_FILES = \
getopt.c \
@@
-37,6
+36,7
@@
RRD_C_FILES = \
rrd_rpncalc.c \
rrd_tune.c \
rrd_update.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_xport.c \
rrd_nan_inf.c \
art_rgba_svp.c \
@@
-95,11
+95,11
@@
librrd_la_SOURCES = $(RRD_C_FILES) rrd_not_thread_safe.c
# your package will not be binary compatible with any other release.
#
# see http://www.gnu.org/software/libtool/manual.html#SEC32 for explanation
# your package will not be binary compatible with any other release.
#
# see http://www.gnu.org/software/libtool/manual.html#SEC32 for explanation
-librrd_la_LDFLAGS = -version-info 2:
4
:0
+librrd_la_LDFLAGS = -version-info 2:
8
:0
librrd_th_la_SOURCES = $(RRD_C_FILES) rrd_thread_safe.c
librrd_th_la_CFLAGS = $(MULTITHREAD_CFLAGS)
librrd_th_la_SOURCES = $(RRD_C_FILES) rrd_thread_safe.c
librrd_th_la_CFLAGS = $(MULTITHREAD_CFLAGS)
-librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info 2:
1
:0
+librrd_th_la_LDFLAGS = $(MULTITHREAD_LDFLAGS) -version-info 2:
8
:0
include_HEADERS = rrd.h
include_HEADERS = rrd.h
@@
-108,6
+108,7
@@
include_HEADERS = rrd.h
#librrd_private_la_LDFLAGS = -static
bin_PROGRAMS = rrdtool rrdupdate
#librrd_private_la_LDFLAGS = -static
bin_PROGRAMS = rrdtool rrdupdate
+
if BUILD_RRDCGI
bin_PROGRAMS += rrdcgi
endif
if BUILD_RRDCGI
bin_PROGRAMS += rrdcgi
endif
@@
-125,9
+126,11
@@
rrdupdate.o: rrd_update.c
$(COMPILE) -DSTANDALONE -c -o $@ $^
rrdtool_SOURCES =
$(COMPILE) -DSTANDALONE -c -o $@ $^
rrdtool_SOURCES =
-rrdtool_DEPENDENCIES = rrd_tool.o
+rrdtool_DEPENDENCIES = rrd_tool.o
librrd.la
rrdtool_LDADD = librrd.la
# strftime is here because we do not usually need it. unices have propper
# iso date support
rrdtool_LDADD = librrd.la
# strftime is here because we do not usually need it. unices have propper
# iso date support
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw strftime.c strftime.h $(fonts_DATA)
+EXTRA_DIST= rrdtool.dsp rrdtool.dsw strftime.c strftime.h rrd.dsp $(fonts_DATA) \
+ Makefile.Win32 Makefile.NetWare get_ver.awk win32comp.c rrd_thread_safe_nt.c
+