ntconfig is no more

[rrdtool.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index cb4fca2..85aad4e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,12 @@
 #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)
+AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(fontsdir)/$(fonts_DATA)\"
 
 RRD_C_FILES =          \
        getopt.c        \
@@ -26,6 +29,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   \
@@ -36,24 +40,29 @@ RRD_C_FILES =               \
        rrd_nan_inf.c   \
        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 +70,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 +91,4 @@ rrdtool_SOURCES =
 rrdtool_DEPENDENCIES = rrd_tool.o
 rrdtool_LDADD  = librrd.la
 
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw
+EXTRA_DIST= rrdtool.dsp rrdtool.dsw $(fonts_DATA)