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 840 by gezelter, Wed Oct 29 14:29:12 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 98 | Line 98 | CXXFLAGS_C=@CXXFLAGS@
98   # C++ flags
99   CXXFLAGS_C=@CXXFLAGS@
100  
101 + # C++ template flags
102 + OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
103 +
104 + # C++ namespace flag
105 + EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
106 +
107   # Preprocessor flag for fortran
108   PREPFLAG=@PREPFLAG@
109  
# Line 107 | Line 113 | FFLAGS_C=@FFLAGS@
113   # Fortran flags
114   FFLAGS_C=@FFLAGS@
115  
116 + # Fortran90 flags
117 + F90FLAGS_C=@F90FLAGS@
118 +
119   # LDFLAGS
120   LDFLAGS=@LDFLAGS@
121  
# Line 120 | Line 129 | CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
129  
130   INCLUDES= -I.. -I../../libBASS -I../../libmdtools
131   MPI_INCLUDES= -I$(MPI_INC)  
132 < CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
132 > CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
133   DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
134   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
135  
# Line 131 | Line 140 | LIBS=$(BASS_LIB) $(MD_LIB)
140   BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a
141   MD_LIB=$(TOP)/libmdtools/libmdtools.a
142   MD_MPI_LIB=$(TOP)/libmdtools/libmdtools_MPI.a
143 < LIBS=$(BASS_LIB) $(MD_LIB)
144 < MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
143 > LIBS=$(MD_LIB) $(BASS_LIB)
144 > MPI_LIBS=$(MD_MPI_LIB) $(BASS_MPI_LIB)
145  
146 < OOPSE_LDFLAGS=$(FLIBS) $(FLIBS_EXTRA) -L$(TOP)/libmdtools -lmdtools -L$(TOP)/libBASS -lBASS -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
146 > OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
147  
148 < 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)
148 > OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
149  
150 +
151   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
152  
153   obj/%.o: %.cpp
# Line 203 | Line 213 | distclean : dummy
213          for i in $(LIBSUBDIRS); do \
214            (cd $$i; $(RM) *.o) || exit 1; \
215          done
216 <        $(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp Make.dep
216 >        $(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp
217  
218   devclean : distclean
219  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines