X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=088de0d80ac004a8a7d1f7ba1a0efc9873199fff;hb=9f7c295af3d1743b9b9ee2b0e536384c27844473;hp=43f7ce40b5079df6a95f7c28f970e0fb244b984b;hpb=c10fefe3a9cdbf1d9daac1bc6bf687362d59115d;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 43f7ce4..088de0d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,13 +4,12 @@
 #
 #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
-fontsdir =  $(datadir)/rrdtool/fonts
-fonts_DATA = DejaVuSansMono-Roman.ttf
 
 if STATIC_PROGRAMS
 AM_LDFLAGS = -all-static
 endif
 
+INCLUDES = -DLOCALEDIR="\"$(datadir)/locale\""
 RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
 AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
 
@@ -19,6 +18,8 @@ UPD_C_FILES =		\
 	rrd_getopt1.c	\
 	parsetime.c	\
 	rrd_hw.c	\
+	rrd_hw_math.c	\
+	rrd_hw_update.c	\
 	rrd_diff.c	\
 	rrd_format.c	\
 	rrd_info.c	\
@@ -49,10 +50,11 @@ RRD_C_FILES =		\
 
 noinst_HEADERS = \
 	unused.h \
-	rrd_gfx.h \
 	rrd_getopt.h parsetime.h \
-	rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_hw.h rrd_rpncalc.h \
-	rrd_nan_inf.h fnv.h rrd_graph.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
 
 noinst_LTLIBRARIES        = librrdupd.la
@@ -101,11 +103,11 @@ librrd_la_LIBADD          = librrdupd.la $(ALL_LIBS)
 # 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:99:0
+librrd_la_LDFLAGS         = -version-info 2:10:0
 
 librrd_th_la_SOURCES         = $(UPD_C_FILES) $(RRD_C_FILES) rrd_thread_safe.c
 librrd_th_la_CFLAGS          = $(MULTITHREAD_CFLAGS)
-librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:99:0
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:10:0
 librrd_th_la_LIBADD          = $(ALL_LIBS)
 
 include_HEADERS	= rrd.h
@@ -128,6 +130,6 @@ rrdtool_LDADD	= librrd.la
 
 # strftime is here because we do not usually need it. unices have propper
 # iso date support
-EXTRA_DIST= strftime.c strftime.h $(fonts_DATA) \
+EXTRA_DIST= strftime.c strftime.h \
 	win32comp.c  rrd_thread_safe_nt.c get_ver.awk