ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/src/Makefile.in
(Generate patch)

Comparing trunk/OOPSE/src/Makefile.in (file contents):
Revision 774 by mmeineke, Fri Sep 19 16:03:44 2003 UTC vs.
Revision 838 by gezelter, Wed Oct 29 03:06:51 2003 UTC

# Line 49 | Line 49 | MPI_F90_MODS=@MPI_F90_MODS@
49   # MPI F90 Module path
50   MPI_F90_MODS=@MPI_F90_MODS@
51  
52 < # Compiler dependent Fortran module
53 < F_MACH_DEFS=@fortran_machine_defs@
52 > # MPI F90 libname
53 > MPIMODLIBNAME=@MPIMODLIBNAME@
54  
55 # Compiler dependent Fortran module
56 FLIBS_EXTRA = @F90LIBS@
57
55   # Location of yacc (or its substitution)
56   YACC=@YACC@
57  
# Line 71 | Line 68 | F90=@F90@
68   # F90 compiler
69   F90=@F90@
70  
71 + # F90 libraries (for linking with C)
72 + F90LIBS=@F90LIBS@
73 +
74   # ar
75   AR=@AR@
76  
# Line 107 | Line 107 | FFLAGS_C=@FFLAGS@
107   # Fortran flags
108   FFLAGS_C=@FFLAGS@
109  
110 + # Fortran90 flags
111 + F90FLAGS_C=@F90FLAGS@
112 +
113   # LDFLAGS
114   LDFLAGS=@LDFLAGS@
115  
# Line 131 | Line 134 | LIBS=$(BASS_LIB) $(MD_LIB)
134   BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a
135   MD_LIB=$(TOP)/libmdtools/libmdtools.a
136   MD_MPI_LIB=$(TOP)/libmdtools/libmdtools_MPI.a
137 < LIBS=$(BASS_LIB) $(MD_LIB)
138 < MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
137 > LIBS=$(MD_LIB) $(BASS_LIB)
138 > MPI_LIBS=$(MD_MPI_LIB) $(BASS_MPI_LIB)
139  
140 < OOPSE_LDFLAGS=$(FLIBS) $(FLIBS_EXTRA) -L$(TOP)/libmdtools -lmdtools -L$(TOP)/libBASS -lBASS -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
140 > OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
141  
142 < OOPSE_MPI_LDFLAGS=$(FLIBS) $(FLIBS_EXTRA) -L$(TOP)/libmdtools -lmdtools_MPI -L$(TOP)/libBASS -lBASS_MPI -L$(MPI_LIBDIR) -lmpichf90 -lmpich -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
142 > OOPSE_MPI_LDFLAGS= -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) $(MPI_LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
143  
144   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
145  
# Line 203 | Line 206 | distclean : dummy
206          for i in $(LIBSUBDIRS); do \
207            (cd $$i; $(RM) *.o) || exit 1; \
208          done
209 <        $(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp Make.dep
209 >        $(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp
210  
211   devclean : distclean
212  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines