I was just taking a look at the development RRDtool build (I'm looking

forward to SVG support), and had a few problems with an out-of-tree
build. I find using a separate build directory makes things much
easier to manage, especially when building for multiple architectures.

I've attached the minor patches for the progress that I made (I couldn't
get the Perl modules to work, but the main binaries seem okay), and
would be grateful if you could commit them (or something like them!).
-- Joseph Walton <joe@kafsemo.org>

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@211 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index d2eaad343ed20f301fdc2275b603dbfa4614b61d..facb91581bad21e1960df623c301a08da5897483 100644 (file)
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = tcl
 
 # the following files are not mentioned in any other Makefile
-EXTRA_DIST = $(shell for A in perl-*; do cat $$A/MANIFEST | sed -e s,^,$$A/, ; done)
+EXTRA_DIST = $(shell for A in $(srcdir)/perl-*; do cat $$A/MANIFEST | sed -e s,^,$$A/, ; done)
 
 # lets schedule the perl stuff for installation
 # the special call to install-sh is because the -d switch is not portable

diff --git a/libraries/freetype-2.0.5/Makefile.am b/libraries/freetype-2.0.5/Makefile.am
index 1f2def191d2cf6b4482623638da12135cb843c86..6dbf2a0380310b0996e0233d0919cc66a2232184 100644 (file)
--- a/libraries/freetype-2.0.5/Makefile.am
+++ b/libraries/freetype-2.0.5/Makefile.am
@@ -22,4 +22,4 @@ librrd_freetype_la_SOURCES = \
 
 EXTRA_DIST= README ChangeLog cffdrivr.c      cffparse.c      cffload.c       cffobjs.c       cffgload.c
 
-INCLUDES = -Iinclude
+INCLUDES = -I$(srcdir)/include

diff --git a/src/Makefile.am b/src/Makefile.am
index 75a29d57d2326772ddfe8cc643ee8c288136887c..58b71c19f7843b4f1caaa34575676b54e4962ada 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,31 +8,31 @@ 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_LIB                   = $(top_builddir)/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_LIB       = $(top_builddir)/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@
+ART_LIB           = $(top_builddir)/libraries/@ART_LIB_DIR@/librrd_art.la
+ART_INCLUDES       = -I$(top_srcdir)/libraries/@ART_LIB_DIR@ -I$(top_builddir)/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_LIB                   = $(top_builddir)/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_LIB           = $(top_builddir)/libraries/@ZLIB_LIB_DIR@/librrd_z.la
 ZLIB_INCLUDES      = -I$(top_srcdir)/libraries/@ZLIB_LIB_DIR@
 endif
 
@@ -113,11 +113,11 @@ 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