X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2FMakefile.am;h=6f3928c86d25b9549bc8c20b99be78c2d68fc520;hp=15e8bf4fb8016e45392150a13d1635a6d0201c26;hb=f9e5bd6a9d41c4607291cbbd88280129184ab325;hpb=28205db1029436d3064e507dc4cf62d60dbc4636

diff --git a/src/Makefile.am b/src/Makefile.am
index 15e8bf4..6f3928c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,23 +4,18 @@
 #
 #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
 
-CGI_LIB_DIR	   = $(top_srcdir)/@CGI_LIB_DIR@
-GD_LIB_DIR	   = $(top_srcdir)/@GD_LIB_DIR@
-PNG_LIB_DIR	   = $(top_srcdir)/@PNG_LIB_DIR@
-ZLIB_LIB_DIR	   = $(top_srcdir)/@ZLIB_LIB_DIR@
-
-INCLUDES 	   = -I$(CGI_LIB_DIR) -I$(GD_LIB_DIR) -I$(PNG_LIB_DIR) -I$(ZLIB_LIB_DIR)
-
-#COMPILE   = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-#LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA)
-#LINK      = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o $@
+#INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
+#           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
+RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
+AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\"
 
 RRD_C_FILES =		\
-	gdpng.c		\
 	getopt.c	\
 	getopt1.c	\
-	gifsize.c	\
 	parsetime.c	\
 	hash_32.c	\
 	rrd_hw.c	\
@@ -35,42 +30,56 @@ 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	\
 	rrd_rpncalc.c \
 	rrd_tune.c	\
 	rrd_update.c	\
-	getopt.h ntconfig.h parsetime.h rrd_format.h rrd_tool.h rrd.h rrd_hw.h rrd_rpncalc.h
-
-# Build two libraries.  One is a public one that gets installed in
-# $prefix/lib.  Libtool does not create an archive of the PIC compiled
-# objects for this library type.  The second library is a private one
-# meant to build the RRDs.so for perl-shared.  In this case libtool
-# creates a ./.lib/*.al file that contains the PIC compiled object
-# files.
-
-RRD_LIBS =				\
-	$(CGI_LIB_DIR)/librrd_cgi.la	\
-	$(GD_LIB_DIR)/librrd_gd.la	\
-	$(PNG_LIB_DIR)/librrd_png.la	\
-	$(ZLIB_LIB_DIR)/librrd_z.la
+	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_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_is_thread_safe.h
+
+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)
+# 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_CFLAGS          = $(MULTITHREAD_CFLAGS)
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 1:0:0
 
-lib_LTLIBRARIES           = librrd.la
-noinst_LTLIBRARIES        = librrd_private.la
-
-librrd_la_SOURCES         = $(RRD_C_FILES)
-librrd_private_la_SOURCES = $(RRD_C_FILES)
-
-librrd_la_LIBADD          = $(RRD_LIBS)
-librrd_la_LDFLAGS         = -version-info 0:0:0
 
 include_HEADERS	= rrd.h
 
-librrd_private_la_LIBADD  = $(RRD_LIBS)
-librrd_private_la_LDFLAGS = -static
+#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
@@ -78,14 +87,16 @@ 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.c: rrd_update.c
-	-ln -s rrd_update.c rrdupdate.c
-
-rrdupdate.o: rrdupdate.c
-	$(COMPILE) -DSTANDALONE -c rrdupdate.c
+rrdupdate.o: rrd_update.c
+	$(COMPILE) -DSTANDALONE -c -o $@ $^
 
-rrdtool_SOURCES	= rrd_tool.c
+rrdtool_SOURCES = 
+rrdtool_DEPENDENCIES = rrd_tool.o
 rrdtool_LDADD	= librrd.la
 
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw
+# 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)