sync-up changes for 1.8.3b release

This commit is contained in:
treadway 2004-01-23 01:51:24 +00:00
parent 7b35ccf32d
commit 172c31063d
3 changed files with 149 additions and 241 deletions

View File

@ -250,7 +250,7 @@ noinst_HEADERS = \
hypre_blas.h
dependent_includes = $(noinst_HEADERS)
EXTRA_DIST = README
#
FILES = \
dasum.c\

View File

@ -17,7 +17,6 @@
#
# Makefile.am --- automake input file for Hypre test drivers
#
SOURCES = $(f77_ij_SOURCES) $(f77_ij_b_SOURCES) $(f77_ij_mv_SOURCES) $(f77_struct_SOURCES) $(fei_SOURCES) $(ij_SOURCES) $(nodist_ij_C___SOURCES) $(ij_b_SOURCES) $(ij_mv_SOURCES) $(nodist_ij_mv_C___SOURCES) $(new_ij_SOURCES) $(nodist_new_ij_C___SOURCES) $(sstruct_SOURCES) $(nodist_sstruct_C___SOURCES) $(struct_SOURCES) $(nodist_struct_C___SOURCES)
srcdir = @srcdir@
@ -41,12 +40,11 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
bin_PROGRAMS = ij$(EXEEXT) ij_mv$(EXEEXT) new_ij$(EXEEXT) \
sstruct$(EXEEXT) struct$(EXEEXT)
EXTRA_PROGRAMS = f77_ij$(EXEEXT) f77_ij_b$(EXEEXT) f77_ij_mv$(EXEEXT) \
f77_struct$(EXEEXT) fei$(EXEEXT) ij_b$(EXEEXT) ij.C++$(EXEEXT) \
new_ij.C++$(EXEEXT) ij_mv.C++$(EXEEXT) struct.C++$(EXEEXT) \
sstruct.C++$(EXEEXT)
EXTRA_PROGRAMS = ij$(EXEEXT) ij_mv$(EXEEXT) new_ij$(EXEEXT) \
sstruct$(EXEEXT) struct$(EXEEXT) f77_ij$(EXEEXT) \
f77_ij_b$(EXEEXT) f77_ij_mv$(EXEEXT) f77_struct$(EXEEXT) \
fei$(EXEEXT) ij_b$(EXEEXT) ij.C++$(EXEEXT) new_ij.C++$(EXEEXT) \
ij_mv.C++$(EXEEXT) struct.C++$(EXEEXT) sstruct.C++$(EXEEXT)
subdir = test
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -59,44 +57,68 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/HYPRE_config.h
CONFIG_CLEAN_FILES =
am__installdirs = $(DESTDIR)$(bindir)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_f77_ij_OBJECTS = f77_ij.$(OBJEXT)
f77_ij_OBJECTS = $(am_f77_ij_OBJECTS)
am__DEPENDENCIES_1 =
f77_ij_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_f77_ij_b_OBJECTS = f77_ij_b.$(OBJEXT)
f77_ij_b_OBJECTS = $(am_f77_ij_b_OBJECTS)
f77_ij_b_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_f77_ij_mv_OBJECTS = f77_ij_mv.$(OBJEXT)
f77_ij_mv_OBJECTS = $(am_f77_ij_mv_OBJECTS)
f77_ij_mv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_f77_struct_OBJECTS = f77_struct.$(OBJEXT)
f77_struct_OBJECTS = $(am_f77_struct_OBJECTS)
f77_struct_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_fei_OBJECTS = fei-fei.$(OBJEXT)
fei_OBJECTS = $(am_fei_OBJECTS)
fei_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_ij_OBJECTS = ij.$(OBJEXT)
ij_OBJECTS = $(am_ij_OBJECTS)
ij_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
nodist_ij_C___OBJECTS = ij.C++.$(OBJEXT)
ij_C___OBJECTS = $(nodist_ij_C___OBJECTS)
ij_C___DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_ij_b_OBJECTS = ij_b.$(OBJEXT)
ij_b_OBJECTS = $(am_ij_b_OBJECTS)
ij_b_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_ij_mv_OBJECTS = ij_mv.$(OBJEXT)
ij_mv_OBJECTS = $(am_ij_mv_OBJECTS)
ij_mv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
nodist_ij_mv_C___OBJECTS = ij_mv.C++.$(OBJEXT)
ij_mv_C___OBJECTS = $(nodist_ij_mv_C___OBJECTS)
ij_mv_C___DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_new_ij_OBJECTS = new_ij.$(OBJEXT)
new_ij_OBJECTS = $(am_new_ij_OBJECTS)
new_ij_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
nodist_new_ij_C___OBJECTS = new_ij.C++.$(OBJEXT)
new_ij_C___OBJECTS = $(nodist_new_ij_C___OBJECTS)
new_ij_C___DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_sstruct_OBJECTS = sstruct.$(OBJEXT)
sstruct_OBJECTS = $(am_sstruct_OBJECTS)
sstruct_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
nodist_sstruct_C___OBJECTS = sstruct.C++.$(OBJEXT)
sstruct_C___OBJECTS = $(nodist_sstruct_C___OBJECTS)
sstruct_C___DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_struct_OBJECTS = struct.$(OBJEXT)
struct_OBJECTS = $(am_struct_OBJECTS)
struct_DEPENDENCIES = $(am__DEPENDENCIES_1)
nodist_struct_C___OBJECTS = struct.C++.$(OBJEXT)
struct_C___OBJECTS = $(nodist_struct_C___OBJECTS)
struct_C___DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@ -306,7 +328,7 @@ ij_mv_SOURCES = ij_mv.c
new_ij_SOURCES = new_ij.c
sstruct_SOURCES = sstruct.c
struct_SOURCES = struct.c
ij_DEPENDENCIES = \
ij_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -315,7 +337,7 @@ ij_DEPENDENCIES = \
$(includedir)/parcsr_mv.h\
$(includedir)/krylov.h
ij_mv_DEPENDENCIES = \
ij_mv_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -323,7 +345,7 @@ ij_mv_DEPENDENCIES = \
$(includedir)/HYPRE_parcsr_ls.h\
$(includedir)/krylov.h
new_ij_DEPENDENCIES = \
new_ij_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -332,12 +354,12 @@ new_ij_DEPENDENCIES = \
$(includedir)/parcsr_mv.h\
$(includedir)/krylov.h
sstruct_DEPENDENCIES = \
sstruct_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE_sstruct_ls.h\
$(includedir)/krylov.h
struct_DEPENDENCIES = \
struct_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE_struct_ls.h\
$(includedir)/struct_mv.h\
@ -448,7 +470,7 @@ nodist_new_ij_C___SOURCES = new_ij.C++.cxx
nodist_ij_mv_C___SOURCES = ij_mv.C++.cxx
nodist_struct_C___SOURCES = struct.C++.cxx
nodist_sstruct_C___SOURCES = sstruct.C++.cxx
f77_ij_DEPENDENCIES = \
f77_ij_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -457,7 +479,7 @@ f77_ij_DEPENDENCIES = \
$(includedir)/parcsr_mv.h\
$(includedir)/krylov.h
f77_ij_mv_DEPENDENCIES = \
f77_ij_mv_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -465,18 +487,18 @@ f77_ij_mv_DEPENDENCIES = \
$(includedir)/HYPRE_parcsr_ls.h\
$(includedir)/krylov.h
f77_struct_DEPENDENCIES = \
f77_struct_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE_struct_ls.h\
$(includedir)/struct_mv.h\
$(includedir)/krylov.h
#f77_struct_b_DEPENDENCIES = \
#f77_struct_b_dependencies = \
#$(includedir)/utilities.h\
#$(includedir)/HYPRE_struct_ls.h\
#$(includedir)/struct_mv.h\
#$(includedir)/krylov.h
fei_DEPENDENCIES = \
fei_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -484,7 +506,7 @@ fei_DEPENDENCIES = \
$(includedir)/HYPRE_parcsr_ls.h\
$(includedir)/HYPRE_LinSysCore.h
ij_b_DEPENDENCIES = \
ij_b_dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -497,7 +519,7 @@ ij_b_DEPENDENCIES = \
$(includedir)/bHYPRE_IJParCSRVector_Impl.h\
$(includedir)/bHYPRE_ParCSRDiagScale_Impl.h
#struct_b_DEPENDENCIES = \
#struct_b_dependencies = \
#$(includedir)/utilities.h\
#$(includedir)/HYPRE_struct_ls.h\
#$(includedir)/Hypre_Box_Stub.h\
@ -511,7 +533,7 @@ ij_b_DEPENDENCIES = \
#$(includedir)/Hypre_StructJacobi_Stub.h\
#$(includedir)/Hypre_StructSMG_Stub.h\
#$(includedir)/Hypre_PCG_Stub.h
ij_C___DEPENDENCIES = \
ij_C___dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -520,7 +542,7 @@ ij_C___DEPENDENCIES = \
$(includedir)/parcsr_mv.h\
$(includedir)/krylov.h
new_ij_C___DEPENDENCIES = \
new_ij_C___dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -529,7 +551,7 @@ new_ij_C___DEPENDENCIES = \
$(includedir)/parcsr_mv.h\
$(includedir)/krylov.h
ij_mv_C___DEPENDENCIES = \
ij_mv_C___dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE.h\
$(includedir)/HYPRE_IJ_mv.h\
@ -537,13 +559,13 @@ ij_mv_C___DEPENDENCIES = \
$(includedir)/HYPRE_parcsr_ls.h\
$(includedir)/krylov.h
struct_C___DEPENDENCIES = \
struct_C___dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE_struct_ls.h\
$(includedir)/struct_mv.h\
$(includedir)/krylov.h
sstruct_C___DEPENDENCIES = \
sstruct_C___dependencies = \
$(includedir)/utilities.h\
$(includedir)/HYPRE_sstruct_ls.h\
$(includedir)/krylov.h
@ -742,6 +764,7 @@ EXTRA_DIST = \
funcs.sh\
runtest.sh
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
all: all-recursive
.SUFFIXES:
@ -775,34 +798,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkdir_p) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \
done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done
clean-binPROGRAMS:
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
f77_ij$(EXEEXT): $(f77_ij_OBJECTS) $(f77_ij_DEPENDENCIES)
@rm -f f77_ij$(EXEEXT)
$(F77LINK) $(f77_ij_LDFLAGS) $(f77_ij_OBJECTS) $(f77_ij_LDADD) $(LIBS)
@ -1062,10 +1057,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-recursive
all-am: Makefile $(PROGRAMS)
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
$(mkdir_p) $(DESTDIR)$(bindir)
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@ -1092,8 +1086,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
mostlyclean-am
clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@ -1112,7 +1105,7 @@ info-am:
install-data-am:
install-exec-am: install-binPROGRAMS
install-exec-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
@ -1139,26 +1132,25 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-binPROGRAMS
uninstall-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
clean clean-binPROGRAMS clean-generic clean-libtool \
clean-local clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-recursive distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic \
clean clean-generic clean-libtool clean-local clean-recursive \
ctags ctags-recursive distclean distclean-compile \
distclean-generic distclean-libtool distclean-recursive \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-info-am
uninstall-info-am
all: ij ij_mv new_ij struct sstruct
@ -1184,6 +1176,24 @@ sstruct.C++.cxx:
struct.C++.cxx:
cp -f $(srcdir)/struct.c struct.C++.cxx
$(ij_OBJECTS): $(ij_dependencies)
$(ij_mv_OBJECTS): $(ij_mv_dependencies)
$(new_ij_OBJECTS): $(new_ij_dependencies)
$(sstruct_OBJECTS): $(sstruct_dependencies)
$(struct_OBJECTS): $(struct_dependencies)
$(f77_ij_OBJECTS): $(f77_ij_dependencies)
$(f77_ij_mv_OBJECTS): $(f77_ij_mv_dependencies)
$(f77_struct_OBJECTS): $(f77_struct_dependencies)
#$(f77_struct_b_OBJECTS): $(f77_struct_b_dependencies)
$(fei_OBJECTS): $(fei_dependencies)
$(ij_b_OBJECTS): $(ij_b_dependencies)
#$(struct_b_OBJECTS): $(struct_b_dependencies)
$(ij_C___OBJECTS): $(ij_C___dependencies)
$(new_ij_C___OBJECTS): $(new_ij_C___dependencies)
$(ij_mv_C___OBJECTS): $(ij_mv_C___dependencies)
$(struct_C___OBJECTS): $(struct_C___dependencies)
$(sstruct_C___OBJECTS): $(sstruct_C___dependencies)
clean-local:
@ \
for i in ij ij_mv new_ij sstruct struct \

View File

@ -13,10 +13,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
SOURCES = $(create_2d_laplacian_SOURCES) $(create_3d_laplacian_SOURCES) $(one_to_many_SOURCES) $(one_to_many_vector_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@ -38,8 +34,6 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
noinst_PROGRAMS = one_to_many$(EXEEXT) one_to_many_vector$(EXEEXT) \
create_2d_laplacian$(EXEEXT) create_3d_laplacian$(EXEEXT)
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -52,40 +46,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/HYPRE_config.h
CONFIG_CLEAN_FILES =
PROGRAMS = $(noinst_PROGRAMS)
am_create_2d_laplacian_OBJECTS = create_2d_laplacian.$(OBJEXT)
create_2d_laplacian_OBJECTS = $(am_create_2d_laplacian_OBJECTS)
create_2d_laplacian_LDADD = $(LDADD)
am_create_3d_laplacian_OBJECTS = create_3d_laplacian.$(OBJEXT)
create_3d_laplacian_OBJECTS = $(am_create_3d_laplacian_OBJECTS)
create_3d_laplacian_LDADD = $(LDADD)
am_one_to_many_OBJECTS = one_to_many.$(OBJEXT)
one_to_many_OBJECTS = $(am_one_to_many_OBJECTS)
one_to_many_LDADD = $(LDADD)
am_one_to_many_vector_OBJECTS = one_to_many_vector.$(OBJEXT)
one_to_many_vector_OBJECTS = $(am_one_to_many_vector_OBJECTS)
one_to_many_vector_LDADD = $(LDADD)
am__installdirs = $(DESTDIR)$(bindir)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(create_2d_laplacian_SOURCES) \
$(create_3d_laplacian_SOURCES) $(one_to_many_SOURCES) \
$(one_to_many_vector_SOURCES)
DIST_SOURCES = $(create_2d_laplacian_SOURCES) \
$(create_3d_laplacian_SOURCES) $(one_to_many_SOURCES) \
$(one_to_many_vector_SOURCES)
ETAGS = etags
CTAGS = ctags
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@ -139,12 +103,7 @@ LAPACKLIBFLAGS = @LAPACKLIBFLAGS@
LAPACKNEEDED_FALSE = @LAPACKNEEDED_FALSE@
LAPACKNEEDED_TRUE = @LAPACKNEEDED_TRUE@
LAPACK_LIBS = @LAPACK_LIBS@
LDFLAGS = \
-L$(srcdir)/../struct_mv\
-L$(srcdir)/../utilities\
-lHYPRE_struct_mv\
-lHYPRE_utilities
LDFLAGS = @LDFLAGS@
LIBDIRNEEDED_FALSE = @LIBDIRNEEDED_FALSE@
LIBDIRNEEDED_TRUE = @LIBDIRNEEDED_TRUE@
LIBM = @LIBM@
@ -229,19 +188,34 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
bin_SCRIPTS = V99-09-23.hypre_convert V2000-05-31.hypre_convert
one_to_many_SOURCES = one_to_many.c
one_to_many_vector_SOURCES = one_to_many_vector.c
create_2d_laplacian_SOURCES = create_2d_laplacian.c
create_3d_laplacian_SOURCES = create_3d_laplacian.c
AM_CPPFLAGS = -DHYPRE_TIMING\
-I$(top_srcdir)/utilities\
-I$(top_srcdir)/struct_mv
EXTRA_DIST = \
V2000-05-31.hypre_convert\
V99-09-23.hypre_convert\
ardra_write_matrix.m\
create_2d_laplacian.c\
create_3d_laplacian.c\
dco_8.dat\
hypre_struct_collapse\
lap_write_matrix.m\
manalyze.m\
mkdist\
mklibs\
mklibs.aix\
mklibs.babel\
mvit\
one_to_many.c\
one_to_many_vector.c\
read_matrix.m\
read_vector.m\
readij.m\
readysmp.m\
write_matrix.m\
write_vector.m\
writeysmp.m
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@ -272,59 +246,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
create_2d_laplacian$(EXEEXT): $(create_2d_laplacian_OBJECTS) $(create_2d_laplacian_DEPENDENCIES)
@rm -f create_2d_laplacian$(EXEEXT)
$(LINK) $(create_2d_laplacian_LDFLAGS) $(create_2d_laplacian_OBJECTS) $(create_2d_laplacian_LDADD) $(LIBS)
create_3d_laplacian$(EXEEXT): $(create_3d_laplacian_OBJECTS) $(create_3d_laplacian_DEPENDENCIES)
@rm -f create_3d_laplacian$(EXEEXT)
$(LINK) $(create_3d_laplacian_LDFLAGS) $(create_3d_laplacian_OBJECTS) $(create_3d_laplacian_LDADD) $(LIBS)
one_to_many$(EXEEXT): $(one_to_many_OBJECTS) $(one_to_many_DEPENDENCIES)
@rm -f one_to_many$(EXEEXT)
$(LINK) $(one_to_many_LDFLAGS) $(one_to_many_OBJECTS) $(one_to_many_LDADD) $(LIBS)
one_to_many_vector$(EXEEXT): $(one_to_many_vector_OBJECTS) $(one_to_many_vector_DEPENDENCIES)
@rm -f one_to_many_vector$(EXEEXT)
$(LINK) $(one_to_many_vector_LDFLAGS) $(one_to_many_vector_OBJECTS) $(one_to_many_vector_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
$(mkdir_p) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
$(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \
done
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
.c.o:
$(COMPILE) -c $<
.c.obj:
$(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
@ -334,52 +255,12 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS:
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
CTAGS:
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@ -410,9 +291,8 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
all-am: Makefile
installdirs:
$(mkdir_p) $(DESTDIR)$(bindir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@ -439,13 +319,11 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
mostlyclean-am
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@ -459,7 +337,7 @@ info-am:
install-data-am:
install-exec-am: install-binSCRIPTS
install-exec-am:
install-info: install-info-am
@ -473,8 +351,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
@ -484,21 +361,42 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-binSCRIPTS
uninstall-am:
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstPROGRAMS ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-binSCRIPTS install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-binSCRIPTS \
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am
#bin_SCRIPTS = V99-09-23.hypre_convert V2000-05-31.hypre_convert
#noinst_PROGRAMS = one_to_many \
# one_to_many_vector \
# create_2d_laplacian \
# create_3d_laplacian
#one_to_many_SOURCES = one_to_many.c
#one_to_many_vector_SOURCES = one_to_many_vector.c
#create_2d_laplacian_SOURCES = create_2d_laplacian.c
#create_3d_laplacian_SOURCES = create_3d_laplacian.c
#AM_CPPFLAGS = -DHYPRE_TIMING\
# -I$(top_srcdir)/utilities\
# -I$(top_srcdir)/struct_mv
#LDFLAGS = \
# -L$(srcdir)/../struct_mv\
# -L$(srcdir)/../utilities\
# -lHYPRE_struct_mv\
# -lHYPRE_utilities
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: