From 21b222ed595597cc0d91f330727c15f480b34e76 Mon Sep 17 00:00:00 2001 From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE> Date: Mon, 7 Jul 2003 14:32:22 +0000 Subject: [PATCH] Use AM_MAINTAINER_MODE, automatically create documentation with "make dist". --- .cvsignore | 2 +- Makefile.am | 21 +++++++++++++++++---- configure.ac | 3 ++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0d73616..19e1845 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1,7 @@ Makefile Makefile.in aclocal.m4 -albert-1.2.tar.gz +albert-*.tar.gz autom4te.cache bin config.cache diff --git a/Makefile.am b/Makefile.am index 485bf3c..450f919 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,14 @@ if GRAPE - SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT GRAPE + SUBDIRS = gnu-compat BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT GRAPE else - SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT + SUBDIRS = gnu-compat BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT endif ACLOCAL_AMFLAGS = -I ./m4 EXTRA_DIST = DEMO $(wildcard m4/*.m4) +if MAINTAINER_MODE # This target only makes sense for maintainers!! cvs-clean: @echo Fixing package for cvs commit... @@ -29,10 +30,22 @@ cvs-clean: cp -f INSTALL admin/ chgrp -R albert * -dist-hook: +# +# this one requires write access to the source directory. One day one might +# want to automakify ALBERT/doc/ ... +# +documentation: + make -C $(top_srcdir)/ALBERT/doc/ albert.ps + +dist-hook: documentation @echo Deleting CVS directories in $(distdir) rm -rf `find $(distdir) -name CVS` + @echo Deleting .cvsignore file in $(distdir) + rm -f `find $(distdir) -name '.cvsignore'` @echo Cleaning up DEMO directory in $(distdir) find $(distdir)/DEMO \( -name \*~ -o -name \*.o -o -name \*.lo \) -exec /bin/rm -f {} \; find $(distdir)/DEMO \( -name ellipt -o -name heat -o -name nonlin \) -exec /bin/rm -f {} \; - find $(distdir)/DEMO -name Makefile -exec /bin/rm -f {} \; \ No newline at end of file + find $(distdir)/DEMO -name Makefile -exec /bin/rm -f {} \; + +endif + diff --git a/configure.ac b/configure.ac index ded6443..30b32f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,10 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([albert], [1.2], [dani@mathematik.uni-freiburg.de]) +AC_INIT([albert], [1.2-pre1], [dani@mathematik.uni-freiburg.de]) AC_CONFIG_SRCDIR([ALBERT/src/Common/albert.h]) +AM_MAINTAINER_MODE AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERT_UTIL/Makefile gnu-compat/Makefile -- GitLab