X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2FMakefile.am;h=77f48ca6b13986a3fd68e42170e1629f00e74e54;hp=246ef789a4579fab9c9941bd5f85f166534e09b0;hb=0dc5d6d50c0d95ba4f04b656358b26518d4ce854;hpb=0ac27e1ec3d519ec6f10d780364ad632e3c57285

diff --git a/src/Makefile.am b/src/Makefile.am
index 246ef78..77f48ca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,11 +6,12 @@
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
 DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
 fontsdir =  $(datadir)/rrdtool/fonts
-fonts_DATA = VeraMono.ttf
+fonts_DATA = DejaVuSansMono-Roman.ttf
 
 #INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
 #           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
-AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(fontsdir)/$(fonts_DATA)\"
+RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
+AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
 
 RRD_C_FILES =		\
 	getopt.c	\
@@ -36,11 +37,15 @@ RRD_C_FILES =		\
 	rrd_rpncalc.c \
 	rrd_tune.c	\
 	rrd_update.c	\
+	rrd_version.c	\
 	rrd_xport.c	\
 	rrd_nan_inf.c	\
+        art_rgba_svp.c \
+        art_rgba_svp.h \
+	unused.h \
 	rrd_gfx.c rrd_gfx.h \
 	rrd_afm.c rrd_afm_data.c \
-	getopt.h ntconfig.h parsetime.h \
+	getopt.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 \
@@ -57,12 +62,45 @@ 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)
+
+# This flag accepts an argument of the form current[:revision[:age]]. So,
+# passing -version-info 3:12:1 sets current to 3, revision to 12, and age to 1.
+#
+# If either revision or age are omitted, they default to 0. Also note that
+# age must be less than or equal to the current interface number.
+#
+# Here are a set of rules to help you update your library version information:
+#
+#   1. Start with version information of 0:0:0 for each libtool library.
+#
+#   2. Update the version information only immediately before a public
+#   release of your software. More frequent updates are unnecessary, and
+#   only guarantee that the current interface number gets larger faster.
+#
+#   3. If the library source code has changed at all since the last update,
+#   then increment revision (c:r:a becomes c:r+1:a).
+#
+#   4. If any interfaces have been added, removed, or changed since the last
+#   update, increment current, and set revision to 0.
+#
+#   5. If any interfaces have been added since the last public release, then
+#   increment age.
+#
+#   6. If any interfaces have been removed since the last public release,
+#   then set age to 0.
+#
+# Never try to set the interface numbers so that they correspond to the
+# release number of your package. This is an abuse that only fosters
+# misunderstanding of the purpose of library versions. Instead, use the
+# -release flag (see Release numbers), but be warned that every release of
+# 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 1:0:0
+librrd_la_LDFLAGS         = -version-info 2:5:0
 
 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 1:0:0
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:1:0
 
 
 include_HEADERS	= rrd.h
@@ -91,4 +129,6 @@ rrdtool_SOURCES =
 rrdtool_DEPENDENCIES = rrd_tool.o
 rrdtool_LDADD	= librrd.la
 
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw $(fonts_DATA)
+# 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)