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

Comparing trunk/OOPSE/utils/Makefile.in (file contents):
Revision 747 by gezelter, Fri Sep 5 21:28:52 2003 UTC vs.
Revision 785 by gezelter, Thu Sep 25 16:42:34 2003 UTC

# Line 51 | Line 51 | FLIBS_EXTRA = @F90LIBS@
51   MPI_F90_MODS=@MPI_F90_MODS@
52  
53   # Compiler dependent Fortran module
54 < FLIBS_EXTRA = @F90LIBS@
54 > F90LIBS = @F90LIBS@
55  
56   # Location of yacc (or its substitution)
57   YACC=@YACC@
# Line 103 | Line 103 | FFLAGS_C=@F90FLAGS@
103   PREPDEFFLAG=@PREPDEFFLAG@
104  
105   # Fortran flags
106 < FFLAGS_C=@F90FLAGS@
106 > FFLAGS_C=@FFLAGS@
107  
108 + # Fortran90 flags
109 + F90FLAGS_C=@F90FLAGS@
110 +
111   # LDFLAGS
112   LDFLAGS=@LDFLAGS@
113  
# Line 115 | Line 118 | MPI_INCLUDES= $(MPI_INC) $(MPI_INC)/mpi2c++
118   # include paths starting with "." are all relative to the SUBDIRS!!!
119  
120   INCLUDES= -I.. -I../../libBASS -I../../libmdtools
121 < MPI_INCLUDES= $(MPI_INC) $(MPI_INC)/mpi2c++
121 > MPI_INCLUDES= $(MPI_INC)
122   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
123   CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
124   DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
# Line 132 | Line 135 | QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(FLIBS) $(FL
135   MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
136  
137   QUICKLATE_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
138 < QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(FLIBS) $(FLIBS_EXTRA)
138 > QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
139  
140   SRC_DIR := $(PWD)
141  
# Line 181 | Line 184 | quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB)
184   depend: Make.dep
185  
186   quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB)
187 <        $(CC) $(CFLAGS) $(QUICK_OBJS) -o $@@ $(QUICKLATE_LDFLAGS) $(QUICKLATE_LDADD)
187 >        $(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(QUICKLATE_LDFLAGS) $(QUICKLATE_LDADD)
188  
189   install : $(QUICKLATE)
190          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin
# Line 209 | Line 212 | distclean : dummy
212          for i in $(LIBSUBDIRS); do \
213            (cd $$i; $(RM) *.o) || exit 1; \
214          done
215 <        $(RM) $(QUICKLATE) *.o *~ Make.temp Make.dep
215 >        $(RM) $(QUICKLATE) *.o *~ Make.temp
216  
217   devclean : distclean
218  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines