X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=6bee6b71b0109a24128c4e1a60e83a814d6ac075;hb=97939155f7c748cd3729dd5f4e1b6707a82a817c;hp=77f48ca6b13986a3fd68e42170e1629f00e74e54;hpb=0dc5d6d50c0d95ba4f04b656358b26518d4ce854;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 77f48ca..6bee6b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,6 @@
 #
 #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
-DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
 fontsdir =  $(datadir)/rrdtool/fonts
 fonts_DATA = DejaVuSansMono-Roman.ttf
 
@@ -96,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:5: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)
@@ -115,6 +114,8 @@ endif
 
 rrdcgi_SOURCES	= rrd_cgi.c
 rrdcgi_LDADD	= librrd.la
+rrdcgi_CPPFLAGS = $(AM_CPPFLAGS) @CGI_CPPFLAGS@
+rrdcgi_LDFLAGS = @CGI_LDFLAGS@ @CGI_LIBS@
 
 rrdupdate_SOURCES = 
 rrdupdate_LDADD	= rrdupdate.o librrd.la
@@ -131,4 +132,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