X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=fde9585dfdb7f2905f40cb48d2d0e31941319533;hb=7a942d263044e07b9e861472361b544d4133af71;hp=6b5c808f3cec2a4e770e35fa6f8384f8d54d4aaf;hpb=94ae951f7544740f84d6041df31a4ca84f4a1c0e;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b5c808..fde9585 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,65 +4,69 @@
 #
 #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
 
-#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@
+
+UPD_C_FILES =		\
+	parsetime.c	\
+	rrd_hw.c	\
+	rrd_diff.c	\
+	rrd_format.c	\
+	rrd_info.c	\
+	rrd_error.c	\
+	rrd_open.c	\
+	rrd_nan_inf.c	\
+	rrd_rpncalc.c	\
+	rrd_update.c
 
 RRD_C_FILES =		\
 	getopt.c	\
 	getopt1.c	\
-	parsetime.c	\
 	hash_32.c	\
-	rrd_hw.c	\
 	pngsize.c	\
 	rrd_create.c	\
-	rrd_diff.c	\
 	rrd_dump.c	\
-	rrd_info.c	\
-	rrd_error.c	\
 	rrd_fetch.c	\
-	rrd_format.c	\
 	rrd_graph.c	\
 	rrd_graph_helper.c	\
 	rrd_last.c	\
 	rrd_first.c	\
-	rrd_open.c	\
 	rrd_resize.c	\
 	rrd_restore.c	\
-	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 \
-	rrd_gfx.c rrd_gfx.h \
+	rrd_gfx.c \
 	rrd_afm.c rrd_afm_data.c \
+	rrd_tool.c
+
+noinst_HEADERS = \
+        art_rgba_svp.h \
+	unused.h \
+	rrd_gfx.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
 
+noinst_LTLIBRARIES        = librrdupd.la
+
 lib_LTLIBRARIES           = librrd.la 
 if BUILD_MULTITHREAD
 lib_LTLIBRARIES           += librrd_th.la
 endif
 
-#noinst_LTLIBRARIES        = librrd_private.la
+librrdupd_la_SOURCES      = $(UPD_C_FILES) rrd_not_thread_safe.c
+librrdupd_la_LIBADD       = $(CORE_LIBS)
 
-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_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.
@@ -97,19 +101,17 @@ 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:8:0
 
-librrd_th_la_SOURCES         = $(RRD_C_FILES) rrd_thread_safe.c
+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:1:0
-
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:8:0
+librrd_th_la_LIBADD          = $(ALL_LIBS)
 
 include_HEADERS	= rrd.h
 
-#librrd_private_la_LIBADD  = $(RRD_LIBS)
-#librrd_private_la_LDFLAGS = -static
-
 bin_PROGRAMS	= rrdtool rrdupdate
+
 if BUILD_RRDCGI
 bin_PROGRAMS += rrdcgi
 endif
@@ -117,19 +119,15 @@ endif
 rrdcgi_SOURCES	= rrd_cgi.c
 rrdcgi_LDADD	= librrd.la
 
-rrdupdate_SOURCES = 
-rrdupdate_LDADD	= rrdupdate.o librrd.la
-
-# rrdupdate.c: rrd_update.c
-#	-ln -s ${srcdir}/rrdupdate.c rrd_update.c
-
-rrdupdate.o: rrd_update.c
-	$(COMPILE) -DSTANDALONE -c -o $@ $^
+rrdupdate_SOURCES = rrdupdate.c
+rrdupdate_LDADD	  = librrdupd.la
 
 rrdtool_SOURCES = 
-rrdtool_DEPENDENCIES = rrd_tool.o
+rrdtool_DEPENDENCIES = rrd_tool.o librrd.la
 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  rrd_thread_safe_nt.c   
+