From 6d88317ee0f464827c4a601cf208e7c2bd6dbdc1 Mon Sep 17 00:00:00 2001
From: Daniel Koester <Koester@Math.Uni-Augsburg.DE>
Date: Tue, 23 Jul 2002 13:48:01 +0000
Subject: [PATCH] fixed ALBERT_UTIL, and several Makefile.am's
---
MAINTENANCE | 11 ++++++-----
Makefile.am | 6 +++---
README | 7 ++++---
configure.ac | 3 +--
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/MAINTENANCE b/MAINTENANCE
index ae421d5..1b648ef 100644
--- a/MAINTENANCE
+++ b/MAINTENANCE
@@ -13,7 +13,7 @@ The albert-x.x packages are now distributed using GNU autoconf 2.53, automake 1.
/ |--- Common/
/____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERT??_?/
albert-x.x/ * |--- 2d/
- \____________ IAMTOOLS/ |--- 3d/
+ \____________ ALBERT_UTIL/ |--- 3d/
\ |--- Common/
\__________ PLOT_ANSI/ __ src/
\
@@ -44,8 +44,9 @@ Basic Linear Algebra Subroutines, these are compiled if the system on which ALBE
3) DEMO
A few demonstration programs. This package is not touched by automake and includes several small Makefile.in's in which configure substitutes values like installation paths for libraries and headers. This directory can be copied elsewhere by the user after installation. The Makefiles include "Makefile.albert" which resides in $installdir/include together with the C-header files. They are meant to faciliate the first steps with ALBERT.
-4) IAMTOOLS
-This package contains the old ALBERT util.c file, which can be linked to form a separate utility library (message macros, ALBERT memory allocation routines, etc.)
+4) ALBERT_UTIL
+This package contains the old ALBERT util.c file, now split into several smaller source files. It is compiled to form a separate utility library (message macros, ALBERT memory allocation routines, etc.) and should linked to any program using the ALBERT package.
+It can also be used as a standalone utility library.
5) PLOT_ANSI
PLOT_ANSI provides tools for displaying X11 graphics, if gltools is not used.
@@ -73,9 +74,9 @@ V) How to create a distribution
===============================
Step 1)
-At the moment, the subpackages ALBERT, BLAS, DEMO, IAMTOOLS, PLOT_ANSI, and SOLVER are maintained using the version control system CVS. To prepare a distribution, one must first check out the distribution version of these packages. The CVS-module "admin" contains the main administration files like "configure.ac" and the main "Makefile.am" from the root directory. Using
+At the moment, the subpackages ALBERT, BLAS, DEMO, ALBERT_UTIL, PLOT_ANSI, and SOLVER are maintained using the version control system CVS. To prepare a distribution, one must first check out the distribution version of these packages. The CVS-module "admin" contains the main administration files like "configure.ac" and the main "Makefile.am" from the root directory. Using
- cvs co ALBERT BLAS DEMO IAMTOOLS PLOT_ANSI SOLVER admin
+ cvs co ALBERT BLAS DEMO ALBERT_UTIL PLOT_ANSI SOLVER admin
also checks out CVS administration directories in each module. This is ok, since
Makefiles produced by configure have a fixed set of directories to be included in a distribution. Another possibility is
diff --git a/Makefile.am b/Makefile.am
index 04b1360..588a62c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = BLAS IAMTOOLS SOLVER PLOT_ANSI ALBERT
+SUBDIRS = BLAS ALBERT_UTIL SOLVER PLOT_ANSI ALBERT
EXTRA_DIST = DEMO
@@ -6,8 +6,8 @@ EXTRA_DIST = DEMO
cvs-clean:
@echo Fixing package for cvs commit...
find . -name \*~ -exec rm -rf {} \;
- find ./ALBERT ./BLAS ./IAMTOOLS ./PLOT_ANSI ./SOLVER -name Makefile.in -exec rm -rf {} \;
- find ./DEMO ./ALBERT ./BLAS ./IAMTOOLS ./PLOT_ANSI ./SOLVER -name Makefile -exec rm -rf {} \;
+ find ./ALBERT ./BLAS ./ALBERT_UTIL ./PLOT_ANSI ./SOLVER -name Makefile.in -exec rm -rf {} \;
+ find ./DEMO ./ALBERT ./BLAS ./ALBERT_UTIL ./PLOT_ANSI ./SOLVER -name Makefile -exec rm -rf {} \;
find ./DEMO \( -name \*~ -o -name \*.o -o -name \*.lo \) -exec /bin/rm -f {} \;
find ./DEMO \( -name ellipt -o -name heat -o -name nonlin \) -exec /bin/rm -f {} \;
find ./DEMO -name Makefile -exec /bin/rm -f {} \;
diff --git a/README b/README
index 9c3fa55..9b848b4 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Contained in the package are the following subpackages:
/ |--- Common/
/____________ DEMO/ __ src/ _______|--- 1d/ |--- ALBERT??_?/
albert-1.1/ * |--- 2d/
- \____________ IAMTOOLS/ |--- 3d/
+ \____________ ALBERT_UTIL/ |--- 3d/
\ |--- Common/
\__________ PLOT_ANSI/ __ src/
\
@@ -34,8 +34,9 @@ Basic Linear Algebra Subroutines, these are compiled if the system on which ALBE
3) DEMO
A few demonstration programs. This subpackage includes several small Makefile.in's in which configure substitutes values like installation paths for libraries and headers. This directory can be copied elsewhere by the user after installation. The Makefiles include "Makefile.albert" which resides in $installdir/include together with the C-header files. They are meant to faciliate the first steps with ALBERT.
-4) IAMTOOLS
-This package contains the old ALBERT util.c file, which can be linked to form a separate utility library (message macros, ALBERT memory allocation routines, etc.)
+4) ALBERT_UTIL
+This package contains the old ALBERT util.c file, now split into several smaller source files. It is compiled to form a separate utility library (message macros, ALBERT memory allocation routines, etc.) and should linked to any program using the ALBERT package.
+It can also be used as a standalone utility library.
5) PLOT_ANSI
PLOT_ANSI provides tools for displaying X11 graphics, if gltools is not used.
diff --git a/configure.ac b/configure.ac
index f602986..89cec19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_INIT([albert], [1.1], [dani@mathematik.uni-freiburg.de])
AC_CONFIG_SRCDIR([ALBERT/src/Common/albert.h])
-AC_CONFIG_FILES([Makefile BLAS/Makefile IAMTOOLS/Makefile
+AC_CONFIG_FILES([Makefile BLAS/Makefile ALBERT_UTIL/Makefile
SOLVER/Makefile SOLVER/src/Makefile
PLOT_ANSI/Makefile PLOT_ANSI/src/Makefile
DEMO/src/Makefile
@@ -143,7 +143,6 @@ AM_CONDITIONAL(PLOT_FOR_IBM, test x$plot_for_ibm = xtrue)
AM_CONDITIONAL(PLOT_FOR_TIT, test x$plot_for_tit = xtrue)
AM_CONDITIONAL(USE_GLTOOLS, test x$LIBGLTOOLS_PRESENT = x1)
-AC_SUBST(object_type)
AC_SUBST(gltools_include)
AC_SUBST(make_own_blas_lib)
AC_SUBST(LIBGLTOOLS_PRESENT)
--
GitLab