started updating for 1.2 release

[rrdtool.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5f3e09c..b04965a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,29 +2,27 @@
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
-SUBDIRS = libraries src bindings doc examples
+SUBDIRS = src bindings doc examples
 
   # the following files are not mentioned in any other Makefile
-EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS rrdtool.spec
+EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
+            rrdtool.spec
 
 CLEANFILES = config.cache
 
 # use relaxed rules when building dists
-AUTOMAKE_OPTIONS= foreign no-dependencies
+AUTOMAKE_OPTIONS= foreign 
 
 # where we keep local rules for automake
-ACLOCAL_M4=    $(top_srcdir)/config/aclocal.m4
-AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
-AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
+
+ACLOCAL_M4= $(top_srcdir)/aclocal.m4
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+#AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
 
 to-docs: to-versync
        (cd doc && $(MAKE) clean && $(MAKE) && $(MAKE) pdf)
        (cd website && wmk-1.7.4 -f manual tutorial contributors.wml && ./site-sync )
 
-to-versync: 
-       perl -i -p -e '"$(VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/; $$v=sprintf("%1d.%02d0%02d1" ,$${1},$${2},$${3}); s|VERSION\s*=\s*[\d.]+|VERSION = $$v|' perl-*/RRD?.pm
-       perl -i -p -e 's|RRDtool\s+\d+\.\d+\.\d+ |RRDtool $(VERSION) |' src/*.[ch]
-
 to-dist: to-docs dist
        mv $(PACKAGE)-$(VERSION).tar.gz archive
 
@@ -36,11 +34,11 @@ to-scp: to-dist
 
 site-perl-inst: site-perl-install
 
-site-perl-install: bindings/perl-piped/Makefile bindings/perl-shared/Makefile
+site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile
        cd bindings/perl-piped && $(MAKE) install
        cd bindings/perl-shared && $(MAKE) install
 
-site-tcl-install:
+site-tcl-install: all
        cd bindings/tcl && $(MAKE) tcl-install
 
 ##END##