From 09b5662dbda7abdbe3d4dc5654dc6737cd6c90c1 Mon Sep 17 00:00:00 2001
From: Daniel Koester <Koester@Math.Uni-Augsburg.DE>
Date: Thu, 16 Jun 2005 15:45:21 +0000
Subject: [PATCH] Changes for consistency in the names of ALBERTA libraries: -
libraries are now named according to the pattern
libalberta2_<DIM_OF_WORLD>d[_debug].<LIBRARY_SUFFIX>
this is more consistent with libalberta2_util
---
Makefile.am | 2 +-
Makefile.am.template | 6 +++---
generate-alberta-automakefiles.sh | 8 ++++----
m4/alberta-check.m4 | 4 ++--
m4/alberta-dims.m4 | 4 ++--
m4/grapeiface.m4 | 6 +++---
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 37216bb..94be4c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ uninstall_code:
# make a DEMO tar-ball and install it in pkgdatadir for later use
#
-DEMO = @PACKAGE_NAME@-@PACKAGE_VERSION@-demo
+DEMO = @PACKAGE_NAME@-demo
pkgdata_DATA = $(DEMO).tar.gz
demo-tarball: $(DEMO).tar.gz
diff --git a/Makefile.am.template b/Makefile.am.template
index 7129eaa..b3c3e5d 100644
--- a/Makefile.am.template
+++ b/Makefile.am.template
@@ -6,14 +6,14 @@
DIM_OF_WORLD = %DIM_OF_WORLD%
ALBERTA_DEBUG = %ALBERTA_DEBUG%
-lib_LTLIBRARIES = libalberta%LIBCODE%.la
+lib_LTLIBRARIES = libalberta2%LIBCODE%.la
include $(srcdir)/../Common/Makefile.am.include
AM_CFLAGS = $(ALBERTA_%EFLAGS%_CFLAGS)
-nodist_libalberta%LIBCODE%_la_SOURCES = $(sources)
+nodist_libalberta2%LIBCODE%_la_SOURCES = $(sources)
if HAVE_GLTOOLS
-nodist_libalberta%LIBCODE%_la_SOURCES += ../Common/gltools.c
+nodist_libalberta2%LIBCODE%_la_SOURCES += ../Common/gltools.c
endif
diff --git a/generate-alberta-automakefiles.sh b/generate-alberta-automakefiles.sh
index 3a503ed..00192b5 100755
--- a/generate-alberta-automakefiles.sh
+++ b/generate-alberta-automakefiles.sh
@@ -8,14 +8,14 @@
for ALBERTA_DEBUG in 0 1; do
for DIM_OF_WORLD in 1 2 3; do
if test $ALBERTA_DEBUG -eq 0; then
- LIBCODE=${DIM_OF_WORLD}
+ LIBCODE=_${DIM_OF_WORLD}d
EFLAGS=OPTIMIZE
else
- LIBCODE=${DIM_OF_WORLD}_debug
+ LIBCODE=_${DIM_OF_WORLD}d_debug
EFLAGS=DEBUG
fi
- mkdir -p alberta/src/alberta$LIBCODE
- sed -e "s/%DIM_OF_WORLD%/$DIM_OF_WORLD/g" Makefile.am.template -e "s/%DEBUG%/$DEBUG/g" -e "s/%ALBERTA_DEBUG%/$ALBERTA_DEBUG/g" -e "s/%LIBCODE%/$LIBCODE/g" -e "s/%EFLAGS%/$EFLAGS/g" > alberta/src/alberta$LIBCODE/Makefile.am
+ mkdir -p alberta/src/alberta2$LIBCODE
+ sed -e "s/%DIM_OF_WORLD%/$DIM_OF_WORLD/g" Makefile.am.template -e "s/%DEBUG%/$DEBUG/g" -e "s/%ALBERTA_DEBUG%/$ALBERTA_DEBUG/g" -e "s/%LIBCODE%/$LIBCODE/g" -e "s/%EFLAGS%/$EFLAGS/g" > alberta/src/alberta2$LIBCODE/Makefile.am
done
done
\ No newline at end of file
diff --git a/m4/alberta-check.m4 b/m4/alberta-check.m4
index c2a6bc0..8a85524 100644
--- a/m4/alberta-check.m4
+++ b/m4/alberta-check.m4
@@ -23,10 +23,10 @@ dnl
AC_DEFUN([ALBERTA_CHECK_NEWLIBS],
[
if test "${ALBERTA_DEBUG}" = "1"; then
- ALBERTA_LIB_$1=alberta$1_debug
+ ALBERTA_LIB_$1=alberta_$1d_debug
ALBERTA_LIB_$1_C=ac_cv_lib_ALBERTA$1_DEBUG
else
- ALBERTA_LIB_$1=alberta$1
+ ALBERTA_LIB_$1=alberta_$1d
ALBERTA_LIB_$1_C=ac_cv_lib_ALBERTA$1
fi
#
diff --git a/m4/alberta-dims.m4 b/m4/alberta-dims.m4
index a322d1c..f99f2e3 100644
--- a/m4/alberta-dims.m4
+++ b/m4/alberta-dims.m4
@@ -9,9 +9,9 @@ AC_DEFUN([ALBERTA_DIMENSION_DISABLE],
[ALBERTA_ENABLE_FLAG([alberta-$1],
[disable building of an ALBERTA library for Finite Elements of dimension $1.], 1)
dnl if test "$ALBERTA_$1$1" -eq 1; then
- AC_CONFIG_FILES([alberta/src/alberta$1/Makefile])
+ AC_CONFIG_FILES([alberta/src/alberta2_$1d/Makefile])
dnl if test "$DEBUG" -eq 1; then
- AC_CONFIG_FILES([alberta/src/alberta$1_debug/Makefile])
+ AC_CONFIG_FILES([alberta/src/alberta2_$1d_debug/Makefile])
dnl fi
dnl fi
])
diff --git a/m4/grapeiface.m4 b/m4/grapeiface.m4
index 0276f0f..a80064e 100644
--- a/m4/grapeiface.m4
+++ b/m4/grapeiface.m4
@@ -9,11 +9,11 @@ AM_CONDITIONAL(GRAPE, test -n "${GRAPE_LIB}")
ALBERTA_LIB_PATH=$prefix/lib
ALBERTA_INCLUDE_PATH='$(top_srcdir)/alberta/src/Common/ -I$(top_srcdir)/alberta_util/src/ -I$(top_builddir)/alberta_util/src/'
-ALBERTA_LIBS_1='$(top_builddir)/alberta/src/alberta1/libalberta1.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+ALBERTA_LIBS_1='$(top_builddir)/alberta/src/alberta2_1d/libalberta2_1d.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
-ALBERTA_LIBS_2='$(top_builddir)/alberta/src/alberta2/libalberta2.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+ALBERTA_LIBS_2='$(top_builddir)/alberta/src/alberta2_2d/libalberta2_2d.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
-ALBERTA_LIBS_3='$(top_builddir)/alberta/src/alberta3/libalberta3.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+ALBERTA_LIBS_3='$(top_builddir)/alberta/src/alberta2_3d/libalberta2_3d.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_DEBUG=
AC_SUBST(ALBERTA_DEBUG)
AC_SUBST(ALBERTA_LIB_PATH)
--
GitLab