X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=Makefile.am;h=de19d0f89f958198c246100cc57e3a791081b3f2;hp=29633d19b3c27ca1183bd7511ddca6bf5a464dc4;hb=edb1cd4b6c1ee3d4d451d8411937dad02396dfca;hpb=5837606887a6d81e8b1f7588525cb1c8783fb62b

diff --git a/Makefile.am b/Makefile.am
index 29633d1..de19d0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,29 +2,28 @@
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
-SUBDIRS = libraries bindings src 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 confignt/config.h favicon.ico
+	     
 
 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 +35,14 @@ 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
 
+site-python-install: all
+	cd bindings/python && $(MAKE) python-install
+
 ##END##