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 747 by gezelter, Fri Sep 5 21:28:52 2003 UTC vs.
Revision 942 by gezelter, Wed Jan 14 15:49:26 2004 UTC

# Line 46 | Line 46 | MPI_INC=@MPI_INC@
46   # MPICH include path
47   MPI_INC=@MPI_INC@
48  
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@
54
55 # Compiler dependent Fortran module
56 FLIBS_EXTRA = @F90LIBS@
57
49   # Location of yacc (or its substitution)
50   YACC=@YACC@
51  
# Line 71 | Line 62 | F90=@F90@
62   # F90 compiler
63   F90=@F90@
64  
65 + # F90 libraries (for linking with C)
66 + F90LIBS=@F90LIBS@
67 +
68   # ar
69   AR=@AR@
70  
# Line 98 | Line 92 | CXXFLAGS_C=@CXXFLAGS@
92   # C++ flags
93   CXXFLAGS_C=@CXXFLAGS@
94  
95 + # C++ template flags
96 + OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
97 +
98 + # C++ namespace flag
99 + EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
100 +
101   # Preprocessor flag for fortran
102   PREPFLAG=@PREPFLAG@
103  
# 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 120 | Line 123 | CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
123  
124   INCLUDES= -I.. -I../../libBASS -I../../libmdtools
125   MPI_INCLUDES= -I$(MPI_INC)  
126 < CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
126 > CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
127   DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
128   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
129  
# 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) -lmpi++ -lmpichf90 -lmpich -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
142 > OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
143  
144 +
145   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
146  
147   obj/%.o: %.cpp
# Line 203 | Line 207 | distclean : dummy
207          for i in $(LIBSUBDIRS); do \
208            (cd $$i; $(RM) *.o) || exit 1; \
209          done
210 <        $(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp Make.dep
210 >        $(RM) $(OOPSE) $(OOPSE_MPI) *.o *~ Make.temp
211  
212   devclean : distclean
213  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines