Moved fortran.h to utilities directory, and removed it from HEADERS list in Makefile.in

1999-10-22 20:56:11 +00:00 · 1999-10-22 20:56:11 +00:00 · 4ee7e162d0
commit 4ee7e162d0
parent 94ca216eb6
26 changed files with 10 additions and 356 deletions
--- a/IJ_matrix_vector/Makefile.in
+++ b/IJ_matrix_vector/Makefile.in
@ -18,7 +18,6 @@ CC = @CC@

 C_COMPILE_FLAGS=@CFLAGS@
 CXX_COMPILE_FLAGS=@CXXFLAGS@
-F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = -DHYPRE_NO_PTHREAD_MANGLING

@ -54,7 +53,6 @@ LFLAGS =\

 HEADERS =\
 aux_parcsr_matrix.h\
- fortran.h\
 HYPRE_IJ_mv.h \
 IJ_matrix_vector.h \
 IJ_matrix.h
@ -108,6 +106,3 @@ ${OBJS}: ${HEADERS}

 .c.o:
 	${CC} -o $@ -c ${CFLAGS} $<
-
-.f.o:
-	${F77} -o $@ -c ${FFLAGS} $<
--- a/IJ_matrix_vector/fortran.h
+++ b/IJ_matrix_vector/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/IJ_mv/Makefile.in
+++ b/IJ_mv/Makefile.in
@ -18,7 +18,6 @@ CC = @CC@

 C_COMPILE_FLAGS=@CFLAGS@
 CXX_COMPILE_FLAGS=@CXXFLAGS@
-F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = -DHYPRE_NO_PTHREAD_MANGLING

@ -54,7 +53,6 @@ LFLAGS =\

 HEADERS =\
 aux_parcsr_matrix.h\
- fortran.h\
 HYPRE_IJ_mv.h \
 IJ_matrix_vector.h \
 IJ_matrix.h
@ -108,6 +106,3 @@ ${OBJS}: ${HEADERS}

 .c.o:
 	${CC} -o $@ -c ${CFLAGS} $<
-
-.f.o:
-	${F77} -o $@ -c ${FFLAGS} $<
--- a/IJ_mv/fortran.h
+++ b/IJ_mv/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/parcsr_linear_solvers/Makefile.in
+++ b/parcsr_linear_solvers/Makefile.in
@ -71,7 +71,6 @@ LFLAGS =\
 ${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}
 
 HEADERS =\
- fortran.h\
 headers.h\
 par_amg.h\
 parcsr_linear_solvers.h\
--- a/parcsr_linear_solvers/fortran.h
+++ b/parcsr_linear_solvers/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/parcsr_ls/Makefile.in
+++ b/parcsr_ls/Makefile.in
@ -71,7 +71,6 @@ LFLAGS =\
 ${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}
 
 HEADERS =\
- fortran.h\
 headers.h\
 par_amg.h\
 parcsr_linear_solvers.h\
--- a/parcsr_ls/fortran.h
+++ b/parcsr_ls/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/parcsr_matrix_vector/Makefile.in
+++ b/parcsr_matrix_vector/Makefile.in
@ -21,7 +21,7 @@ F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = 
 
-CFLAGS = \
+CFLAGS =\
 ${C_COMPILE_FLAGS}\
 -I..\
 -I../utilities\
@ -43,11 +43,9 @@ LFLAGS =\
 -lHYPRE_seq_mv\
 -lHYPRE_utilities\
 ${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}
- 

 HEADERS =\
 communication.h\
- fortran.h\
 headers.h\
 par_csr_matrix.h\
 par_vector.h\
--- a/parcsr_matrix_vector/fortran.h
+++ b/parcsr_matrix_vector/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/parcsr_mv/Makefile.in
+++ b/parcsr_mv/Makefile.in
@ -21,7 +21,7 @@ F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = 
 
-CFLAGS = \
+CFLAGS =\
 ${C_COMPILE_FLAGS}\
 -I..\
 -I../utilities\
@ -43,11 +43,9 @@ LFLAGS =\
 -lHYPRE_seq_mv\
 -lHYPRE_utilities\
 ${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}
- 

 HEADERS =\
 communication.h\
- fortran.h\
 headers.h\
 par_csr_matrix.h\
 par_vector.h\
--- a/parcsr_mv/fortran.h
+++ b/parcsr_mv/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/seq_linear_solvers/amg/amg/fortran_setup.h
+++ b/seq_linear_solvers/amg/amg/fortran_setup.h
@ -13,17 +13,7 @@
 *
 *****************************************************************************/

-#ifndef HYPRE_AMG_FORTRAN_HEADER
-#define HYPRE_AMG_FORTRAN_HEADER
-
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
+#include "fortran.h"

 /* setup */
 #define hypre_CALL_SETUP(Setup_err_flag, A, amg_data) \
--- a/seq_linear_solvers/amg/amg/headers.h
+++ b/seq_linear_solvers/amg/amg/headers.h
@ -28,7 +28,7 @@

 #include "protos.h"

-#include "fortran.h"
+#include "fortran_setup.h"

 /* malloc debug stuff */
 #ifdef AMG_MALLOC_DEBUG
--- a/seq_linear_solvers/amg/amg/rcs_files
+++ b/seq_linear_solvers/amg/amg/rcs_files
@ -25,6 +25,7 @@ f90amg_setup.c
 f90amg_solve.c
 f90amg_timing.c
 fortran.h
+fortran_setup.h
 general.h
 headers.h
 iinvert.f
--- a/seq_ls/amg/amg/fortran_setup.h
+++ b/seq_ls/amg/amg/fortran_setup.h
@ -13,17 +13,7 @@
 *
 *****************************************************************************/

-#ifndef HYPRE_AMG_FORTRAN_HEADER
-#define HYPRE_AMG_FORTRAN_HEADER
-
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
+#include "fortran.h"

 /* setup */
 #define hypre_CALL_SETUP(Setup_err_flag, A, amg_data) \
--- a/seq_ls/amg/amg/headers.h
+++ b/seq_ls/amg/amg/headers.h
@ -28,7 +28,7 @@

 #include "protos.h"

-#include "fortran.h"
+#include "fortran_setup.h"

 /* malloc debug stuff */
 #ifdef AMG_MALLOC_DEBUG
--- a/seq_ls/amg/amg/rcs_files
+++ b/seq_ls/amg/amg/rcs_files
@ -25,6 +25,7 @@ f90amg_setup.c
 f90amg_solve.c
 f90amg_timing.c
 fortran.h
+fortran_setup.h
 general.h
 headers.h
 iinvert.f
--- a/struct_linear_solvers/Makefile.in
+++ b/struct_linear_solvers/Makefile.in
@ -22,7 +22,7 @@ F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = -DHYPRE_NO_PTHREAD_MANGLING
 
-CFLAGS = \
+CFLAGS =\
 ${C_COMPILE_FLAGS}\
 -I..\
 -I../utilities\
@ -45,9 +45,7 @@ LFLAGS =\
 -lHYPRE_utilities\
 ${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}

-
 HEADERS =\
- fortran.h\
 headers.h\
 pfmg.h\
 sparse_msg.h\
@ -141,7 +139,3 @@ ${OBJS}: ${HEADERS}
 .c.o:
 	${CC} -o $@ -c ${CFLAGS} $<

-.f.o:
-	${F77} -o $@ -c ${FFLAGS} $<
-
-
--- a/struct_linear_solvers/fortran.h
+++ b/struct_linear_solvers/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/struct_ls/Makefile.in
+++ b/struct_ls/Makefile.in
@ -22,7 +22,7 @@ F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = -DHYPRE_NO_PTHREAD_MANGLING
 
-CFLAGS = \
+CFLAGS =\
 ${C_COMPILE_FLAGS}\
 -I..\
 -I../utilities\
@ -45,9 +45,7 @@ LFLAGS =\
 -lHYPRE_utilities\
 ${MPILIBFLAGS} ${LIBFLAGS} ${LDLIBFLAGS}

-
 HEADERS =\
- fortran.h\
 headers.h\
 pfmg.h\
 sparse_msg.h\
@ -141,7 +139,3 @@ ${OBJS}: ${HEADERS}
 .c.o:
 	${CC} -o $@ -c ${CFLAGS} $<

-.f.o:
-	${F77} -o $@ -c ${FFLAGS} $<
-
-
--- a/struct_ls/fortran.h
+++ b/struct_ls/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/struct_matrix_vector/Makefile.in
+++ b/struct_matrix_vector/Makefile.in
@ -18,7 +18,6 @@ CC = @CC@

 C_COMPILE_FLAGS=@CFLAGS@
 CXX_COMPILE_FLAGS=@CXXFLAGS@
-F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = -DHYPRE_NO_PTHREAD_MANGLING

@ -47,7 +46,6 @@ HEADERS =\
 box_neighbors.h\
 communication.h\
 computation.h\
- fortran.h\
 headers.h\
 struct_grid.h\
 struct_matrix.h\
@ -125,6 +123,3 @@ ${OBJS}: ${HEADERS}
 .c.o:
 	${CC} -o $@ -c ${CFLAGS} $<

-.f.o:
-	${F77} -o $@ -c ${FFLAGS} $<
-
--- a/struct_matrix_vector/fortran.h
+++ b/struct_matrix_vector/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif
--- a/struct_mv/Makefile.in
+++ b/struct_mv/Makefile.in
@ -18,7 +18,6 @@ CC = @CC@

 C_COMPILE_FLAGS=@CFLAGS@
 CXX_COMPILE_FLAGS=@CXXFLAGS@
-F77_COMPILE_FLAGS=@F77FLAGS@
 CINCLUDES=@INCLUDES@ @MPIINCLUDE@
 CDEFS = -DHYPRE_NO_PTHREAD_MANGLING

@ -47,7 +46,6 @@ HEADERS =\
 box_neighbors.h\
 communication.h\
 computation.h\
- fortran.h\
 headers.h\
 struct_grid.h\
 struct_matrix.h\
@ -125,6 +123,3 @@ ${OBJS}: ${HEADERS}
 .c.o:
 	${CC} -o $@ -c ${CFLAGS} $<

-.f.o:
-	${F77} -o $@ -c ${FFLAGS} $<
-
--- a/struct_mv/fortran.h
+++ b/struct_mv/fortran.h
@ -1,29 +0,0 @@
-/*BHEADER**********************************************************************
- * (c) 1996   The Regents of the University of California
- *
- * See the file COPYRIGHT_and_DISCLAIMER for a complete copyright
- * notice, contact person, and disclaimer.
- *
- * $Revision$
- *********************************************************************EHEADER*/
-
-/******************************************************************************
- *
- * Fortran <-> C interface macros
- *
- *****************************************************************************/
-
-#ifndef HYPRE_FORTRAN_HEADER
-#define HYPRE_FORTRAN_HEADER
-
-#if defined(IRIX) || defined(DEC)
-#define hypre_NAME_C_FOR_FORTRAN(name) name##_
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#else
-#define hypre_NAME_C_FOR_FORTRAN(name) name##__
-#define hypre_NAME_FORTRAN_FOR_C(name) name##_
-#endif
-
-#define hypre_F90_IFACE(iface_name) hypre_NAME_FORTRAN_FOR_C(iface_name)
-
-#endif