X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=1f1ff3af846240b4ec2e46410e5188ff0b1d4004;hb=61a736a2e1ad057f78cb5c2245207c9d02d86f29;hp=4bf66ace4e68a65e6a3cdf2c13e148e1724198f7;hpb=b48f8f963467ce3e608e286c6dff08b54e05bcef;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 4bf66ac..1f1ff3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,39 +5,12 @@
 #ACLOCAL_M4	   = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
 DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\"
-if USE_INSTALLED_libcgi
-CGI_LIB 	   = -lcgi
-else
-CGI_LIB	           = $(top_srcdir)/libraries/@CGI_LIB_DIR@/librrd_cgi.la
-CGI_INCLUDES       = -I$(top_srcdir)/libraries/@CGI_LIB_DIR@
-endif
-if USE_INSTALLED_libfreetype
-FREETYPE_LIB       = -lfreetype
-else
-FREETYPE_LIB       = $(top_srcdir)/libraries/@FREETYPE_LIB_DIR@/librrd_freetype.la
-FREETYPE_INCLUDES  = -I$(top_srcdir)/libraries/@FREETYPE_LIB_DIR@/include
-endif
-if USE_INSTALLED_libart_lgpl
-ART_LIB            = -lart_lgpl
-else
-ART_LIB 	   = $(top_srcdir)/libraries/@ART_LIB_DIR@/librrd_art.la
-ART_INCLUDES       = -I$(top_srcdir)/libraries/@ART_LIB_DIR@
-endif
-if USE_INSTALLED_libpng
-PNG_LIB            = -lpng
-else
-PNG_LIB		   = $(top_srcdir)/libraries/@PNG_LIB_DIR@/librrd_png.la
-PNG_INCLUDES       = -I$(top_srcdir)/libraries/@PNG_LIB_DIR@
-endif
-if USE_INSTALLED_libz
-ZLIB_LIB           = -lz
-else
-ZLIB_LIB           = $(top_srcdir)/libraries/@ZLIB_LIB_DIR@/librrd_z.la
-ZLIB_INCLUDES      = -I$(top_srcdir)/libraries/@ZLIB_LIB_DIR@
-endif
+fontsdir =  $(datadir)/rrdtool/fonts
+fonts_DATA = VeraMono.ttf
 
-INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
-           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
+#INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
+#           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
+INCLUDES = -DRRD_DEFAULT_FONT=\"$(fontsdir)/$(fonts_DATA)\"
 
 RRD_C_FILES =		\
 	getopt.c	\
@@ -69,42 +42,37 @@ RRD_C_FILES =		\
 	getopt.h ntconfig.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
-
-# 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_nan_inf.h fnv.h rrd_graph.h rrd_afm.h rrd_afm_data.h \
+	rrd_is_thread_safe.h
 
-RRD_LIBS =				\
-	$(CGI_LIB)	\
-	$(FREETYPE_LIB)	\
-	$(ART_LIB)	\
-	$(PNG_LIB)	\
-	$(ZLIB_LIB)
+lib_LTLIBRARIES           = librrd.la 
+if BUILD_MULTITHREAD
+lib_LTLIBRARIES           += librrd_th.la
+endif
 
-lib_LTLIBRARIES           = librrd.la librrd_th.la
-noinst_LTLIBRARIES        = librrd_private.la
+#noinst_LTLIBRARIES        = librrd_private.la
 
 librrd_la_SOURCES         = $(RRD_C_FILES) rrd_not_thread_safe.c
-librrd_private_la_SOURCES = $(RRD_C_FILES)
+#librrd_private_la_SOURCES = $(RRD_C_FILES) rrd_not_thread_safe.c
 
-librrd_la_LIBADD          = $(RRD_LIBS)
-librrd_la_LDFLAGS         = -version-info 1:2:0
+# 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_LIBADD          = $(RRD_LIBS) -lpthread
-librrd_th_la_LDFLAGS         = -version-info 1:2:0
+librrd_th_la_CFLAGS          = $(MULTITHREAD_CFLAGS)
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 1: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
@@ -112,14 +80,14 @@ rrdcgi_LDADD	= librrd.la
 rrdupdate_SOURCES = 
 rrdupdate_LDADD	= rrdupdate.o librrd.la
 
-rrdupdate.c: rrd_update.c
-	-ln -s rrd_update.c rrdupdate.c
+# rrdupdate.c: rrd_update.c
+#	-ln -s ${srcdir}/rrdupdate.c rrd_update.c
 
-rrdupdate.o: rrdupdate.c
-	$(COMPILE) -DSTANDALONE -c rrdupdate.c
+rrdupdate.o: rrd_update.c
+	$(COMPILE) -DSTANDALONE -c -o $@ $^
 
 rrdtool_SOURCES = 
 rrdtool_DEPENDENCIES = rrd_tool.o
 rrdtool_LDADD	= librrd.la
 
-EXTRA_DIST= rrdtool.dsp rrdtool.dsw
+EXTRA_DIST= rrdtool.dsp rrdtool.dsw $(fonts_DATA)