X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=Makefile.am;h=1961ef23dc48c3a481a358e5cdbb2195fa75e708;hp=4bba56ad0c2cbcfec8346c0beebbba2b86a02e5f;hb=fa7d240d60a1179513ae9021bf948247d00592e4;hpb=a1fe8fd19bb4f558150e52c0624869667b739877

diff --git a/Makefile.am b/Makefile.am
index 4bba56a..1961ef2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,21 @@
+# $Id$
+
 ## Process this file with automake to produce Makefile.in
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
-SUBDIRS = libraries 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
+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  win32/Makefile win32/config.h autogen.sh \
+             win32/rrd.dsp win32/rrd.sln win32/rrd.vcproj libtool \
+             win32/rrd_config.h.msvc win32/rrdlib.vcproj win32/rrdtool.dsp \
+             win32/rrdtool.dsw win32/rrdtool.vcproj netware/Makefile  \
+             etc/rrdcached-default etc/rrdcached-init
+
+	     
 
 CLEANFILES = config.cache
 
@@ -13,25 +23,10 @@ CLEANFILES = config.cache
 AUTOMAKE_OPTIONS= foreign 
 
 # where we keep local rules for automake
-
+ACLOCAL_AMFLAGS=-I m4
 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
-
-to-scp: to-dist
-	cp CHANGES  archive/$(PACKAGE)-$(VERSION).tar.gz /home/oetiker/public_html/webtools/rrdtool/pub/
-	(cd /home/oetiker/public_html/webtools/rrdtool/pub; rm $(PACKAGE).tar.gz; ln -s $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).tar.gz)
+#AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config
+#AUTOCONF = @AUTOCONF@ --localdir=$(top_srcdir)/config
 
 #	$(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
 
@@ -44,4 +39,11 @@ site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefil
 site-tcl-install: all
 	cd bindings/tcl && $(MAKE) tcl-install
 
+site-python-install: all
+	cd bindings/python && $(PYTHON) setup.py install $(if $(DESTDIR),--root=$(DESTDIR))
+
+# find . -name "*.c" -or -name "*.h" | xargs perl -0777 -n -e 'while (s/typedef\s+(?:unsigned\s+|signed\s+|unival\s+)?\S+\s+\*?([^{}\s;(]+)//){print "-T$1\n"}'
+indent:
+	find ./ -name "*.[ch]" | xargs indent
+
 ##END##