--font-render-mode is back, and there is also

[rrdtool.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e191cca..6878068 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,60 +7,65 @@
 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@
 
-RRD_C_FILES =          \
-       getopt.c        \
-       getopt1.c       \
+UPD_C_FILES =          \
+       rrd_getopt.c    \
+       rrd_getopt1.c   \
        parsetime.c     \
-       hash_32.c       \
        rrd_hw.c        \
-       pngsize.c       \
-       rrd_create.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_version.c   \
        rrd_xport.c     \
-       rrd_nan_inf.c   \
-        art_rgba_svp.c \
-        art_rgba_svp.h \
+       rrd_gfx.c \
+       rrd_dump.c      \
+       rrd_fetch.c     \
+       rrd_tool.c      \
+       rrd_resize.c \
+       rrd_tune.c
+
+noinst_HEADERS = \
        unused.h \
-       rrd_gfx.c rrd_gfx.h \
-       rrd_afm.c rrd_afm_data.c \
-       getopt.h parsetime.h \
+       rrd_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_nan_inf.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)
 
-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.
@@ -95,18 +100,15 @@ 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:7:0
+librrd_la_LDFLAGS         = -version-info 2:99: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:7:0
-
+librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:99: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
@@ -116,14 +118,8 @@ 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 librrd.la
@@ -131,6 +127,6 @@ 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 rrd.dsp $(fonts_DATA) \
-       Makefile.Win32 Makefile.NetWare get_ver.awk win32comp.c  rrd_thread_safe_nt.c   
+EXTRA_DIST= strftime.c strftime.h $(fonts_DATA) \
+       win32comp.c  rrd_thread_safe_nt.c get_ver.awk