fixed DEF_NAM_FMT definition

[rrdtool.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 47ecf13..87fdd2b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,19 +5,43 @@
 #ACLOCAL_M4       = $(top_srcdir)/config/aclocal.m4
 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
 
-CGI_LIB_DIR       = $(top_srcdir)/@CGI_LIB_DIR@
-FREETYPE_LIB_DIR   = $(top_srcdir)/@FREETYPE_LIB_DIR@
-ART_LIB_DIR       = $(top_srcdir)/@ART_LIB_DIR@
-PNG_LIB_DIR       = $(top_srcdir)/@PNG_LIB_DIR@
-ZLIB_LIB_DIR      = $(top_srcdir)/@ZLIB_LIB_DIR@
-
-INCLUDES          = -I$(CGI_LIB_DIR) -I$(ART_LIB_DIR) \
-       -I$(PNG_LIB_DIR) -I$(ZLIB_LIB_DIR) -I$(FREETYPE_LIB_DIR)/include
+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
+
+INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \
+           $(PNG_INCLUDES) $(ZLIB_INCLUDES)
 
 RRD_C_FILES =          \
        getopt.c        \
        getopt1.c       \
-       gifsize.c       \
        parsetime.c     \
        hash_32.c       \
        rrd_hw.c        \
@@ -38,8 +62,12 @@ RRD_C_FILES =                \
        rrd_rpncalc.c \
        rrd_tune.c      \
        rrd_update.c    \
+       rrd_xport.c     \
+       rrd_nan_inf.c   \
        rrd_gfx.c rrd_gfx.h \
-       getopt.h ntconfig.h parsetime.h rrd_format.h rrd_tool.h rrd.h rrd_hw.h rrd_rpncalc.h
+       rrd_afm.c rrd_afm_data.c \
+       getopt.h ntconfig.h parsetime.h \
+       rrd_format.h rrd_tool.h rrd_xport.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
@@ -49,11 +77,11 @@ RRD_C_FILES =               \
 # files.
 
 RRD_LIBS =                             \
-       $(CGI_LIB_DIR)/librrd_cgi.la    \
-       $(FREETYPE_LIB_DIR)/librrd_freetype.la  \
-       $(ART_LIB_DIR)/librrd_art.la    \
-       $(PNG_LIB_DIR)/librrd_png.la    \
-       $(ZLIB_LIB_DIR)/librrd_z.la
+       $(CGI_LIB)      \
+       $(FREETYPE_LIB) \
+       $(ART_LIB)      \
+       $(PNG_LIB)      \
+       $(ZLIB_LIB)
 
 lib_LTLIBRARIES           = librrd.la
 noinst_LTLIBRARIES        = librrd_private.la