diff --git a/m4/grapeiface.m4 b/m4/grapeiface.m4 index 7eb573df383e5bfa0c72bb85313dcc558a142a7b..e092e991f013893acf4b3648cce7767303c9112b 100644 --- a/m4/grapeiface.m4 +++ b/m4/grapeiface.m4 @@ -17,32 +17,32 @@ fi # ordinary libraries # -ALBERTA_LIBS_1='$(top_builddir)/alberta/src/alberta_1d/libalberta_1d.la $(top_builddir)/alberta_util/src/libalberta_util.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_LIBS_1='$(top_builddir)/alberta/src/alberta_1d/libalberta_1d.la $(top_builddir)/alberta_util/src/libalberta_utilities.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' -ALBERTA_LIBS_2='$(top_builddir)/alberta/src/alberta_2d/libalberta_2d.la $(top_builddir)/alberta_util/src/libalberta_util.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_LIBS_2='$(top_builddir)/alberta/src/alberta_2d/libalberta_2d.la $(top_builddir)/alberta_util/src/libalberta_utilities.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' -ALBERTA_LIBS_3='$(top_builddir)/alberta/src/alberta_3d/libalberta_3d.la $(top_builddir)/alberta_util/src/libalberta_util.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_LIBS_3='$(top_builddir)/alberta/src/alberta_3d/libalberta_3d.la $(top_builddir)/alberta_util/src/libalberta_utilities.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' ALBERTA_DEBUG= # # debug libraries # -ALBERTA_DEBUG_LIBS_1='$(top_builddir)/alberta/src/alberta_1d_debug/libalberta_1d_debug.la $(top_builddir)/alberta_util/src/libalberta_util_debug.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_DEBUG_LIBS_1='$(top_builddir)/alberta/src/alberta_1d_debug/libalberta_1d_debug.la $(top_builddir)/alberta_util/src/libalberta_utilities_debug.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' -ALBERTA_DEBUG_LIBS_2='$(top_builddir)/alberta/src/alberta_2d_debug/libalberta_2d_debug.la $(top_builddir)/alberta_util/src/libalberta_util_debug.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_DEBUG_LIBS_2='$(top_builddir)/alberta/src/alberta_2d_debug/libalberta_2d_debug.la $(top_builddir)/alberta_util/src/libalberta_utilities_debug.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' -ALBERTA_DEBUG_LIBS_3='$(top_builddir)/alberta/src/alberta_3d_debug/libalberta_3d_debug.la $(top_builddir)/alberta_util/src/libalberta_util_debug.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_DEBUG_LIBS_3='$(top_builddir)/alberta/src/alberta_3d_debug/libalberta_3d_debug.la $(top_builddir)/alberta_util/src/libalberta_utilities_debug.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' # # profiling libraries # -ALBERTA_PROFILE_LIBS_1='$(top_builddir)/alberta/src/alberta_1d_profile/libalberta_1d_profile.la $(top_builddir)/alberta_util/src/libalberta_util_profile.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_PROFILE_LIBS_1='$(top_builddir)/alberta/src/alberta_1d_profile/libalberta_1d_profile.la $(top_builddir)/alberta_util/src/libalberta_utilities_profile.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' -ALBERTA_PROFILE_LIBS_2='$(top_builddir)/alberta/src/alberta_2d_profile/libalberta_2d_profile.la $(top_builddir)/alberta_util/src/libalberta_util_profile.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_PROFILE_LIBS_2='$(top_builddir)/alberta/src/alberta_2d_profile/libalberta_2d_profile.la $(top_builddir)/alberta_util/src/libalberta_utilities_profile.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' -ALBERTA_PROFILE_LIBS_3='$(top_builddir)/alberta/src/alberta_3d_profile/libalberta_3d_profile.la $(top_builddir)/alberta_util/src/libalberta_util_profile.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' +ALBERTA_PROFILE_LIBS_3='$(top_builddir)/alberta/src/alberta_3d_profile/libalberta_3d_profile.la $(top_builddir)/alberta_util/src/libalberta_utilities_profile.la $(GPSKCA_ALL_LIBS) $(BLAS_ALL_LIBS)' # # ordinary gfx libraries