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 1119 by tim, Mon Apr 19 17:44:48 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 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 + Dump2XYZ_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
141 + Dump2XYZ_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
142 +
143   SRC_DIR := $(PWD)
144  
145   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
# Line 155 | Line 161 | QUICK_C_FILES = \
161  
162   QUICK_C_FILES = \
163          $(DIR)/quickLate.c
164 + Dump2XYZ_CMD_C_OBJS = \
165 +        $(DIR)/Dump2XYZCmd.c
166 + Dump2XYZ_FILES = \
167 +        $(DIR)/Dump2XYZ.cpp
168  
159
169   DIR:=.
170   QUICK_C_SRCS := $(QUICK_C_FILES)
171   QUICK_SRCS := $(QUICK__C_SRCS)
# Line 168 | Line 177 | QUICK_OBJS := $(QUICK_C_OBJS)
177   DIR:=obj
178   QUICK_C_OBJS := $(QUICK_C_FILES:.c=.o)
179   QUICK_OBJS := $(QUICK_C_OBJS)
180 + Dump2XYZ_CMD_OBJ :=$(Dump2XYZ_CMD_C_OBJS:.c=.o)
181  
182 + Dump2XYZ_CXX_OBJS := $(Dump2XYZ_FILES:.cpp=.o)
183 + Dump2XYZ_OBJS := $(Dump2XYZ_CXX_OBJS) $(Dump2XYZ_CMD_OBJ)
184 +
185   DIR:=MPIobj
186   QUICK_C_MPIOBJS :=      $(QUICK_C_FILES:.c=.o)
187   QUICK_MPIOBJS := $(QUICK_C_MPIOBJS)
# Line 176 | Line 189 | all : $(QUICKLATE)
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 $@ $(QUICKLATE_LDFLAGS) $(QUICKLATE_LDADD)
198  
199 + Dump2XYZ$(EXE) : $(Dump2XYZ_OBJS) $(BASS_LIB) $(MD_LIB)
200 +        $(CXX) $(CXXFLAGS) $(Dump2XYZ_OBJS) -o $@ $(Dump2XYZ_LDFLAGS) $(Dump2XYZ_LDADD)
201 +
202   install : $(QUICKLATE)
203          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin
204          $(INSTALL_PROGRAM) -s $(QUICKLATE) $(OOPSE_HOME)/bin/$(QUICKLATE)
205 +        $(INSTALL_PROGRAM) -s $(Dump2XYZ) $(OOPSE_HOME)/bin/$(QUICKLATE)
206  
207  
208  
# Line 198 | Line 215 | links : $(OOPSE_HOME)/bin/$(QUICKLATE)
215   links : $(OOPSE_HOME)/bin/$(QUICKLATE)
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