diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-07-28 21:38:04 (GMT) |
| commit | 0603e2db00e773702906387620e5644c23360703 (patch) | |
| tree | a3f999ab9a8ac0ae015fedb9eb45a709a99c4a85 /config/commence.in | |
| parent | 6e0e3da2837214179812cf613e78227d4cbb78b3 (diff) | |
| download | hdf5-0603e2db00e773702906387620e5644c23360703.zip hdf5-0603e2db00e773702906387620e5644c23360703.tar.gz hdf5-0603e2db00e773702906387620e5644c23360703.tar.bz2 | |
[svn-r7269] Purpose:
Update
Description:
Revamped the configuration system. The configurations for the Fortran
and C++ libraries are no longer separate from the "main"
configuration system. This involved removing the "configure*" and
"aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
merging settings in the config/ subdirectories into the main config/
subdirectory.
Fortran header files had to be modified a little for Linux. It was
checking if it was a Linux machine by some #defines, however with the
-std=c99 switch, these defines weren't there. I added a check for
some other ones which should be there whether the -std=c99 switch is
used or not.
Platforms tested:
Verbena (Fortran & C++)
Sol (Fortran & C++)
Copper (Fortran & C++)
Modi4 (Parallel, Fortran, & C++)
Misc. update:
Diffstat (limited to 'config/commence.in')
| -rw-r--r-- | config/commence.in | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/config/commence.in b/config/commence.in index af1275c..bb8392d 100644 --- a/config/commence.in +++ b/config/commence.in @@ -6,7 +6,7 @@ ## Things that Make needs .SUFFIXES: -.SUFFIXES: .c .o .lo +.SUFFIXES: .c .f90 .cpp .o .lo @SET_MAKE@ ## Directories to search @@ -15,7 +15,14 @@ ## Programs SHELL=/bin/sh CC=@CC@ +CXX=@CXX@ +F9X=@F9X@ +F9XMODEXT=@F9XMODEXT@ +F9XMODFLAG=@F9XMODFLAG@ +FSEARCH_DIRS=@FSEARCH_DIRS@ CFLAGS=@CFLAGS@ +CXXFLAGS=@CXXFLAGS@ +FFLAGS=@FFLAGS@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ ROOT=@ROOT@ @@ -33,6 +40,10 @@ RUNPARALLEL=@RUNPARALLEL@ RUNTEST=$(RUNSERIAL) TRACE=: +## Languages +HDF_FORTRAN="no" +HDF_CXX="no" + ## Installation points prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -54,6 +65,16 @@ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) LT_UNINSTALL=$(LT) --mode=uninstall $(RM) +# Fortran compilation/linking stuff +LT_FCOMPILE=$(LT) --mode=compile $(F9X) +LT_LINK_FLIB=$(LT) --mode=link $(F9X) -static $(DYNAMIC_DIRS) +LT_LINK_FEXE=$(LT) --mode=link $(F9X) $(LT_STATIC_EXEC) $(DYNAMIC_DIRS) + +# C++ compilation/linking stuff +LT_CXX_COMPILE=$(LT) --mode=compile $(CXX) +LT_LINK_CXX_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS) +LT_LINK_CXX_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) + ## Optional variables. We must declare them here because Irix pmake ## complains if it sees a reference to a variable which has never been ## defined. The main makefile is free to redefine these to something else. |