X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2FMakefile.am;h=6f3928c86d25b9549bc8c20b99be78c2d68fc520;hp=cb4fca2545c1f9703692c1ac8e2c1effdac7a80e;hb=f9e5bd6a9d41c4607291cbbd88280129184ab325;hpb=0240b19174dfda10b6a6dbea0b924e2bd2dbac69

diff --git a/src/Makefile.am b/src/Makefile.am
index cb4fca2..6f3928c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,13 @@
 #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
 DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
+fontsdir =  $(datadir)/rrdtool/fonts
+fonts_DATA = VeraMono.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)\"
 
 RRD_C_FILES =		\
 	getopt.c	\
@@ -26,6 +30,7 @@ RRD_C_FILES =		\
 	rrd_graph.c	\
 	rrd_graph_helper.c	\
 	rrd_last.c	\
+	rrd_first.c	\
 	rrd_open.c	\
 	rrd_resize.c	\
 	rrd_restore.c	\
@@ -34,26 +39,36 @@ RRD_C_FILES =		\
 	rrd_update.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 \
 	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 \
 	rrd_is_thread_safe.h
 
-lib_LTLIBRARIES           = librrd.la librrd_th.la
+lib_LTLIBRARIES           = librrd.la 
+if BUILD_MULTITHREAD
+lib_LTLIBRARIES           += librrd_th.la
+endif
+
 #noinst_LTLIBRARIES        = librrd_private.la
 
 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)
-librrd_la_LDFLAGS         = -version-info 1:2:0
+# see http://www.gnu.org/software/libtool/manual.html#SEC32 for explanation
+librrd_la_LDFLAGS         = -version-info 1:0:0
 
 librrd_th_la_SOURCES         = $(RRD_C_FILES) rrd_thread_safe.c
-librrd_th_la_LIBADD          = -lpthread
-librrd_th_la_LDFLAGS         = -version-info 1:2:0
+librrd_th_la_CFLAGS          = $(MULTITHREAD_CFLAGS)
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 1:0:0
 
 
 include_HEADERS	= rrd.h
@@ -61,7 +76,10 @@ include_HEADERS	= rrd.h
 #librrd_private_la_LIBADD  = $(RRD_LIBS)
 #librrd_private_la_LDFLAGS = -static
 
-bin_PROGRAMS	= rrdcgi rrdtool rrdupdate
+bin_PROGRAMS	= rrdtool rrdupdate
+if BUILD_RRDCGI
+bin_PROGRAMS += rrdcgi
+endif
 
 rrdcgi_SOURCES	= rrd_cgi.c
 rrdcgi_LDADD	= librrd.la
@@ -79,4 +97,6 @@ rrdtool_SOURCES =
 rrdtool_DEPENDENCIES = rrd_tool.o
 rrdtool_LDADD	= librrd.la
 
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw
+# 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)