From: Peter A. Bigot <pab@pabigot.com>
Date: Sat, 17 May 2014 12:10:50 +0000 (-0500)
Subject: automake: update dist checks for recent changes
X-Git-Tag: v1.5.0-rc1~95^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebf63c14b79dc5114ba3215411250ede9add51df;p=thirdparty%2Frrdtool-1.x.git

automake: update dist checks for recent changes

Various files have been added and removed causing the dist and distcheck
Make targets to fail.  This commit fixes dist; distcheck is improved but
is not complete because the bindings Makefile.am assumes the build is
performed in the source tree.  (Standard autotool practice now is to
require support for separated builds.)

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---

diff --git a/Makefile.am b/Makefile.am
index 5e21bb55..846760d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,12 @@ RSYNC = rsync --rsh=ssh
 SUBDIRS = po src examples doc bindings
 
  # the following files are not mentioned in any other Makefile
-EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
-	     rrdtool.spec favicon.ico autogen.sh \
+EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS \
+             rrdtool.spec favicon.ico bootstrap \
              libtool \
              netware/Makefile  \
              etc/rrdcached-default etc/rrdcached-init \
-             win32/Makefile  win32/rrd_config.h  win32/rrdlib.vcproj  win32/rrdtool.vcproj  win32/rrdupdate.vcproj \
-             win32/README    win32/rrd.sln   win32/rrdtool.sln    win32/rrdupdate.sln  win32/Makefile.msc
+             win32/README win32/Makefile.msc
 
 CLEANFILES = config.cache
 
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index adb68e16..7f1b1211 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -11,7 +11,7 @@ SUBDIRS = $(SUB_tcl) $(SUB_lua)
 
 # the following files are not mentioned in any other Makefile
 EXTRA_DIST = perl-piped/MANIFEST perl-piped/README perl-piped/Makefile.PL perl-piped/RRDp.pm perl-piped/t/base.t \
-	     perl-shared/ntmake-build perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm  perl-shared/RRDs.xs perl-shared/t/base.t \
+	     perl-shared/ntmake-build perl-shared/MANIFEST perl-shared/README perl-shared/Makefile.PL perl-shared/RRDs.pm perl-shared/RRDs.ppd perl-shared/RRDs.xs perl-shared/t/base.t \
 	     ruby/CHANGES     ruby/README      ruby/extconf.rb  ruby/main.c      ruby/test.rb \
              python/ACKNOWLEDGEMENT python/AUTHORS python/COPYING python/README python/rrdtoolmodule.c python/setup.py
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e87ed2b..974b9cbd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,8 @@ noinst_HEADERS = \
 	rrd_hw.h rrd_hw_math.h rrd_hw_update.h \
 	rrd_restore.h rrd_create.h \
 	fnv.h rrd_graph.h \
-	rrd_is_thread_safe.h
+	rrd_is_thread_safe.h \
+	rrd_modify.h rrd_update.h rrd_config.h
 
 if BUILD_LIBDBI
 RRD_C_FILES += rrd_fetch_libdbi.c