X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=daaacb6bee7d6ac1321bc5fd4b4b8030ec96053f;hb=46d2e915a9f864304ee107f9ea35a60b01d3e378;hp=5ed0558d02444018d94ce542a548f9c0b7bc241c;hpb=f3df7df77761c610c9ba328fac01619f4e7b563f;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ed0558..daaacb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,12 @@
 #
 #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
-fontsdir =  $(datadir)/rrdtool/fonts
-fonts_DATA = DejaVuSansMono-Roman.ttf
 
-#INCLUDES = $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
-#           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
+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@
 
@@ -17,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	\
@@ -30,30 +33,28 @@ RRD_C_FILES =		\
 	hash_32.c	\
 	pngsize.c	\
 	rrd_create.c	\
-	rrd_dump.c	\
-	rrd_fetch.c	\
 	rrd_graph.c	\
 	rrd_graph_helper.c	\
+	rrd_version.c	\
 	rrd_last.c	\
 	rrd_lastupdate.c	\
 	rrd_first.c	\
-	rrd_resize.c	\
 	rrd_restore.c	\
-	rrd_tune.c	\
-	rrd_version.c	\
 	rrd_xport.c	\
-        art_rgba_svp.c \
 	rrd_gfx.c \
-	rrd_afm.c rrd_afm_data.c \
-	rrd_tool.c
+	rrd_dump.c	\
+	rrd_fetch.c	\
+	rrd_tool.c	\
+	rrd_resize.c \
+	rrd_tune.c
 
 noinst_HEADERS = \
-        art_rgba_svp.h \
 	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_afm.h rrd_afm_data.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
@@ -64,49 +65,18 @@ lib_LTLIBRARIES           += librrd_th.la
 endif
 
 librrdupd_la_SOURCES      = $(UPD_C_FILES) rrd_not_thread_safe.c
-librrdupd_la_LIBADD       = $(CORE_LIBS)
+librrdupd_la_LIBADD       = $(CORE_LIBS) @LIB_LIBINTL@
 
 librrd_la_SOURCES         = $(RRD_C_FILES)
 librrd_la_LIBADD          = librrdupd.la $(ALL_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 2:11:0
+# see http://sourceware.org/autobook/autobook/autobook_91.html
+
+librrd_la_LDFLAGS         = -version-info @LIBVERS@
 
 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:11:0
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info @LIBVERS@
 librrd_th_la_LIBADD          = $(ALL_LIBS)
 
 include_HEADERS	= rrd.h
@@ -129,6 +99,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