X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=68780689db459c4b7546bd26fc58a29ec48b131f;hb=f8c81c20d9fe8183cb481944cd9b29ace3ee37aa;hp=be51036ed35d4f504432d8fb6ad92f3c09902990;hpb=7f4dd5f9c0f20e4d6690685641a9cd8ea621da51;p=rrdtool.git

diff --git a/src/Makefile.am b/src/Makefile.am
index be51036..6878068 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,10 @@
 fontsdir =  $(datadir)/rrdtool/fonts
 fonts_DATA = DejaVuSansMono-Roman.ttf
 
-#INCLUDES = $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
-#           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
+if STATIC_PROGRAMS
+AM_LDFLAGS = -all-static
+endif
+
 RRD_DEFAULT_FONT=@RRD_DEFAULT_FONT@
 AM_CPPFLAGS = -DRRD_DEFAULT_FONT=\"$(RRD_DEFAULT_FONT)\" -DNUMVERS=@NUMVERS@
 
@@ -30,30 +32,26 @@ RRD_C_FILES =		\
 	hash_32.c	\
 	pngsize.c	\
 	rrd_create.c	\
-	rrd_dump.c	\
-	rrd_fetch.c	\
 	rrd_graph.c	\
 	rrd_graph_helper.c	\
+	rrd_version.c	\
 	rrd_last.c	\
 	rrd_lastupdate.c	\
 	rrd_first.c	\
-	rrd_resize.c	\
 	rrd_restore.c	\
-	rrd_tune.c	\
-	rrd_version.c	\
 	rrd_xport.c	\
-        art_rgba_svp.c \
 	rrd_gfx.c \
-	rrd_afm.c rrd_afm_data.c \
-	rrd_tool.c
+	rrd_dump.c	\
+	rrd_fetch.c	\
+	rrd_tool.c	\
+	rrd_resize.c \
+	rrd_tune.c
 
 noinst_HEADERS = \
-        art_rgba_svp.h \
 	unused.h \
-	rrd_gfx.h \
 	rrd_getopt.h parsetime.h \
 	rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_hw.h rrd_rpncalc.h \
-	rrd_nan_inf.h fnv.h rrd_graph.h rrd_afm.h rrd_afm_data.h \
+	rrd_nan_inf.h fnv.h rrd_graph.h \
 	rrd_is_thread_safe.h
 
 noinst_LTLIBRARIES        = librrdupd.la
@@ -102,11 +100,11 @@ librrd_la_LIBADD          = librrdupd.la $(ALL_LIBS)
 # 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:10:0
+librrd_la_LDFLAGS         = -version-info 2:99:0
 
 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:8:0
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:99:0
 librrd_th_la_LIBADD          = $(ALL_LIBS)
 
 include_HEADERS	= rrd.h