X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2FMakefile.am;h=20b2e0ababe6c75ed5fced607dfe7c6f2f7901f2;hb=00e3eda2c5db59d79fd091438c1bc34c7eea9cb3;hp=4689aac02a076455d357b42794ba162ddb9b78e2;hpb=f706c73d5c78d6758f255afcc30da144198a6a02;p=rrdtool-all.git

diff --git a/program/Makefile.am b/program/Makefile.am
index 4689aac0..20b2e0ab 100644
--- a/program/Makefile.am
+++ b/program/Makefile.am
@@ -1,16 +1,20 @@
+# $Id$
+
 ## Process this file with automake to produce Makefile.in
 RSYNC = rsync --rsh=ssh
 
 # build the following subdirectories
-SUBDIRS = src doc examples 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/config.h win32/rrd.dsp win32/rrd.vcproj \
-	     win32/rrdtool.dsp win32/rrdtool.dsw win32/rrdtool.vcproj win32/Makefile \
-	     win32/rrd_config.h.msvc netware/Makefile
+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 \
+             libtool \
+             netware/Makefile  \
+             etc/rrdcached-default etc/rrdcached-init \
+             win32/Makefile  win32/config.h  win32/rrdlib.vcproj  win32/rrdtool.vcproj  win32/rrdupdate.vcproj \
+             win32/README    win32/rrd.sln   win32/rrdtool.sln    win32/rrdupdate.sln 
 
 CLEANFILES = config.cache
 
@@ -18,21 +22,11 @@ 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)
-
-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)
-
 #	$(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
 
 site-perl-inst: site-perl-install
@@ -45,10 +39,10 @@ site-tcl-install: all
 	cd bindings/tcl && $(MAKE) tcl-install
 
 site-python-install: all
-	cd bindings/python && $(PYTHON) setup.py install
+	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 "*.c" -or -name "*.h" | xargs indent
+	find ./ -name "*.[ch]" | xargs indent
 
 ##END##