* integrate necessary cgi functionality into rrd_cgi.c so that libcgi is not

[rrdtool.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 29e6924..d029600 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,14 +4,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
+fonts_DATA = DejaVuSansMono-Roman.ttf
 
-#INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
+#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 +36,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 +95,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)
@@ -110,6 +108,7 @@ include_HEADERS     = rrd.h
 #librrd_private_la_LDFLAGS = -static
 
 bin_PROGRAMS   = rrdtool rrdupdate
+
 if BUILD_RRDCGI
 bin_PROGRAMS += rrdcgi
 endif
@@ -132,4 +131,5 @@ rrdtool_LDADD       = librrd.la
 
 # 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)
+EXTRA_DIST= rrdtool.dsp rrdtool.dsw strftime.c strftime.h rrd.dsp $(fonts_DATA) \
+       Makefile.Win32 Makefile.NetWare get_ver.awk win32comp.c