X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=daaacb6bee7d6ac1321bc5fd4b4b8030ec96053f;hb=46d2e915a9f864304ee107f9ea35a60b01d3e378;hp=85aad4e1052181253e4faf0ccf162cfd474ceb92;hpb=47a4901e2e0ae25ca126cb929d714b417b4bf52e;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 85aad4e..daaacb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,73 +4,85 @@
 #
 #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)\"
+if STATIC_PROGRAMS
+AM_LDFLAGS = -all-static
+endif
 
-RRD_C_FILES =		\
-	getopt.c	\
-	getopt1.c	\
+INCLUDES = -DLOCALEDIR="\"$(datadir)/locale\""
+RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
+AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
+
+UPD_C_FILES =		\
+	rrd_getopt.c	\
+	rrd_getopt1.c	\
 	parsetime.c	\
-	hash_32.c	\
 	rrd_hw.c	\
-	pngsize.c	\
-	rrd_create.c	\
+	rrd_hw_math.c	\
+	rrd_hw_update.c	\
 	rrd_diff.c	\
-	rrd_dump.c	\
+	rrd_format.c	\
 	rrd_info.c	\
 	rrd_error.c	\
-	rrd_fetch.c	\
-	rrd_format.c	\
+	rrd_open.c	\
+	rrd_nan_inf.c	\
+	rrd_rpncalc.c	\
+	rrd_update.c
+
+RRD_C_FILES =		\
+	hash_32.c	\
+	pngsize.c	\
+	rrd_create.c	\
 	rrd_graph.c	\
 	rrd_graph_helper.c	\
+	rrd_version.c	\
 	rrd_last.c	\
+	rrd_lastupdate.c	\
 	rrd_first.c	\
-	rrd_open.c	\
-	rrd_resize.c	\
 	rrd_restore.c	\
-	rrd_rpncalc.c \
-	rrd_tune.c	\
-	rrd_update.c	\
 	rrd_xport.c	\
-	rrd_nan_inf.c	\
-	rrd_gfx.c rrd_gfx.h \
-	rrd_afm.c rrd_afm_data.c \
-	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_gfx.c \
+	rrd_dump.c	\
+	rrd_fetch.c	\
+	rrd_tool.c	\
+	rrd_resize.c \
+	rrd_tune.c
+
+noinst_HEADERS = \
+	unused.h \
+	rrd_getopt.h parsetime.h \
+	rrd_i18n.h \
+	rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h \
+	rrd_hw.h rrd_hw_math.h rrd_hw_update.h \
+	fnv.h rrd_graph.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) @LIB_LIBINTL@
 
-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_SOURCES         = $(RRD_C_FILES)
+librrd_la_LIBADD          = librrdupd.la $(ALL_LIBS)
 
-# librrd_la_LIBADD          = $(RRD_LIBS)
-# see http://www.gnu.org/software/libtool/manual.html#SEC32 for explanation
-librrd_la_LDFLAGS         = -version-info 1:0:0
+# see http://sourceware.org/autobook/autobook/autobook_91.html
 
-librrd_th_la_SOURCES         = $(RRD_C_FILES) rrd_thread_safe.c
-librrd_th_la_CFLAGS          = $(MULTITHREAD_CFLAGS)
-librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 1:0:0
+librrd_la_LDFLAGS         = -version-info @LIBVERS@
 
+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 @LIBVERS@
+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
@@ -78,17 +90,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
 
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw $(fonts_DATA)
+# strftime is here because we do not usually need it. unices have propper
+# iso date support
+EXTRA_DIST= strftime.c strftime.h \
+	win32comp.c  rrd_thread_safe_nt.c get_ver.awk
+