X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=5d2e8098242877c5745b3ccd2175346b12b7bc89;hb=938f2a103ef4988bbd9cd4dc7865078ef03306a1;hp=29e69241d07ebca75eb656abe8b5dfff0ec77871;hpb=ad994d046d175fec8f67cc3b7cddf3cb77d341be;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 29e6924..5d2e809 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,12 +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)
 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	\
@@ -37,13 +37,12 @@ RRD_C_FILES =		\
 	rrd_rpncalc.c \
 	rrd_tune.c	\
 	rrd_update.c	\
+	rrd_version.c	\
 	rrd_xport.c	\
 	rrd_nan_inf.c	\
-        art_rgba_rgba_affine.c \
         art_rgba_svp.c \
-        art_rgb_affine_private.h \
-	art_rgba_rgba_affine.h \
         art_rgba_svp.h \
+	unused.h \
 	rrd_gfx.c rrd_gfx.h \
 	rrd_afm.c rrd_afm_data.c \
 	getopt.h parsetime.h \
@@ -97,7 +96,7 @@ 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
-librrd_la_LDFLAGS         = -version-info 2:1:0
+librrd_la_LDFLAGS         = -version-info 2:6:0
 
 librrd_th_la_SOURCES         = $(RRD_C_FILES) rrd_thread_safe.c
 librrd_th_la_CFLAGS          = $(MULTITHREAD_CFLAGS)
@@ -116,6 +115,8 @@ endif
 
 rrdcgi_SOURCES	= rrd_cgi.c
 rrdcgi_LDADD	= librrd.la
+rrdcgi_CPPFLAGS = $(AM_CPPFLAGS) @CGI_CPPFLAGS@
+rrdcgi_LDFLAGS = @CGI_LDFLAGS@ @CGI_LIBS@
 
 rrdupdate_SOURCES = 
 rrdupdate_LDADD	= rrdupdate.o librrd.la