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 771 by mmeineke, Fri Sep 19 15:20:33 2003 UTC vs.
Revision 1120 by tim, Mon Apr 19 20:54:58 2004 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
125   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
126  
127   QUICKLATE=quickLate$(EXE)
128 + DUMP2XYZ=Dump2XYZ$(EXE)
129  
126
130   BASS_LIB=$(TOP)/libBASS/libBASS.a
131   BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a
132   MD_LIB=$(TOP)/libmdtools/libmdtools.a
# Line 131 | Line 134 | QUICKLATE_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools
134   LIBS=$(BASS_LIB) $(MD_LIB)
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)
137 > LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
138 > LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
139  
140   SRC_DIR := $(PWD)
141  
# Line 155 | Line 158 | QUICK_C_FILES = \
158  
159   QUICK_C_FILES = \
160          $(DIR)/quickLate.c
161 + DUMP2XYZ_C_FILES = \
162 +        $(DIR)/Dump2XYZCmd.c
163 + DUMP2XYZ_CXX_FILES = \
164 +        $(DIR)/Dump2XYZ.cpp
165  
159
166   DIR:=.
167 < QUICK_C_SRCS := $(QUICK_C_FILES)
168 < QUICK_SRCS := $(QUICK__C_SRCS)
167 > C_SRCS := $(QUICK_C_FILES) $(DUMP2XYZ_C_FILES)
168 > CXX_SRCS := $(DUMP2XYZ_CXX_FILES)
169  
170 < C_CXX_SRCS := $(QUICK_C_SRCS)
170 > C_CXX_SRCS := $(C_SRCS) $(CXX_SRCS)
171  
172   #the objects
173  
174   DIR:=obj
175   QUICK_C_OBJS := $(QUICK_C_FILES:.c=.o)
176   QUICK_OBJS := $(QUICK_C_OBJS)
177 + DUMP2XYZ_C_OBJS :=$(DUMP2XYZ_C_FILES:.c=.o)
178 + DUMP2XYZ_CXX_OBJS :=$(DUMP2XYZ_CXX_FILES:.cpp=.o)
179 + DUMP2XYZ_OBJS := $(DUMP2XYZ_CXX_OBJS) $(DUMP2XYZ_C_OBJS)
180  
181   DIR:=MPIobj
182   QUICK_C_MPIOBJS :=      $(QUICK_C_FILES:.c=.o)
183   QUICK_MPIOBJS := $(QUICK_C_MPIOBJS)
184 + DUMP2XYZ_C_MPIOBJS :=   $(DUMP2XYZ_C_FILES:.c=.o)
185 + DUMP2XYZ_CXX_MPIOBJS := $(DUMP2XYZ_CXX_FILES:.cpp=.o)
186 + DUMP2XYZ_MPIOBJS := $(DUMP2XYZ_C_MPIOBJS) $(DUMP2XYZ_CXX_MPIOBJS)
187 +
188   LIBSUBDIRS = \
189          obj \
190          MPIobj
191  
192 < all : $(QUICKLATE)
192 > all : $(QUICKLATE) $(DUMP2XYZ)
193  
194   depend: Make.dep
195  
196   quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB)
197 <        $(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(QUICKLATE_LDFLAGS) $(QUICKLATE_LDADD)
197 >        $(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(LDFLAGS) $(LDADD)
198  
199 < install : $(QUICKLATE)
199 > Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB)
200 >        $(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) -o $@ $(LDFLAGS) $(LDADD)
201 >
202 > install : $(QUICKLATE) $(DUMP2XYZ)
203          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin
204          $(INSTALL_PROGRAM) -s $(QUICKLATE) $(OOPSE_HOME)/bin/$(QUICKLATE)
205 +        $(INSTALL_PROGRAM) -s $(DUMP2XYZ) $(OOPSE_HOME)/bin/$(DUMP2XYZ)
206  
190
191
207   tests : dummy
208  
209   $(OOPSE_HOME)/bin/$(QUICKLATE) : $(QUICKLATE)
210          $(MAKE) install
211  
212 + $(OOPSE_HOME)/bin/$(DUMP2XYZ) : $(DUMP2XYZ)
213 +        $(MAKE) install
214  
215 < links : $(OOPSE_HOME)/bin/$(QUICKLATE)
215 > links : $(OOPSE_HOME)/bin/$(QUICKLATE) $(OOPSE_HOME)/bin/$(DUMP2XYZ)
216          $(MKINSTALLDIRS) $(PREFIX)/bin
217          cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(QUICKLATE) $(QUICKLATE)
218 +        cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(DUMP2XYZ) $(DUMP2XYZ)
219  
220   clean : dummy
221          for i in $(LIBSUBDIRS); do \
222            (cd $$i; $(RM) *.o) || exit 1; \
223          done
224 <        $(RM) $(QUICKLATE) *.o *~ Make.temp
224 >        $(RM) $(QUICKLATE) $(DUMP2XYZ) *.o *~ Make.temp
225  
226   distclean : dummy
227          for i in $(LIBSUBDIRS); do \
228            (cd $$i; $(RM) *.o) || exit 1; \
229          done
230 <        $(RM) $(QUICKLATE) *.o *~ Make.temp Make.dep
230 >        $(RM) $(QUICKLATE) $(DUMP2XYZ) *.o *~ Make.temp
231  
232   devclean : distclean
233  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines