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 785 by gezelter, Thu Sep 25 16:42:34 2003 UTC vs.
Revision 1074 by tim, Mon Mar 1 20:01:50 2004 UTC

# Line 125 | Line 125 | QUICKLATE=quickLate$(EXE)
125   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
126  
127   QUICKLATE=quickLate$(EXE)
128 + ZSUB=zsub$(EXE)
129  
129
130   BASS_LIB=$(TOP)/libBASS/libBASS.a
131   BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a
132   MD_LIB=$(TOP)/libmdtools/libmdtools.a
# Line 137 | Line 137 | SRC_DIR := $(PWD)
137   QUICKLATE_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
138   QUICKLATE_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
139  
140 + ZSUB_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
141 + ZSUB_LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
142 +
143   SRC_DIR := $(PWD)
144  
145   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
# Line 158 | Line 161 | QUICK_C_FILES = \
161  
162   QUICK_C_FILES = \
163          $(DIR)/quickLate.c
164 + ZSUB_CMD_C_OBJS = \
165 +        $(DIR)/CmdlineZsub.c
166 + ZSUB_FILES = \
167 +        $(DIR)/zsub.cpp
168  
162
169   DIR:=.
170   QUICK_C_SRCS := $(QUICK_C_FILES)
171   QUICK_SRCS := $(QUICK__C_SRCS)
# Line 171 | 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 + ZSUB_CMD_OBJ :=$(ZSUB_CMD_C_OBJS:.c=.o)
181  
182 + ZSUB_CXX_OBJS := $(ZSUB_FILES:.cpp=.o)
183 + ZSUB_OBJS := $(ZSUB_CXX_OBJS) $(ZSUB_CMD_OBJ)
184 +
185   DIR:=MPIobj
186   QUICK_C_MPIOBJS :=      $(QUICK_C_FILES:.c=.o)
187   QUICK_MPIOBJS := $(QUICK_C_MPIOBJS)
# Line 179 | Line 189 | all : $(QUICKLATE)
189          obj \
190          MPIobj
191  
192 < all : $(QUICKLATE)
192 > all : $(QUICKLATE) $(ZSUB)
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)
198  
199 + zsub$(EXE) : $(ZSUB_OBJS) $(BASS_LIB) $(MD_LIB)
200 +        $(CXX) $(CXXFLAGS) $(ZSUB_OBJS) -o $@ $(ZSUB_LDFLAGS) $(ZSUB_LDADD)
201 +
202   install : $(QUICKLATE)
203          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin
204          $(INSTALL_PROGRAM) -s $(QUICKLATE) $(OOPSE_HOME)/bin/$(QUICKLATE)
205 +        $(INSTALL_PROGRAM) -s $(ZSUB) $(OOPSE_HOME)/bin/$(QUICKLATE)
206  
207  
208  
# Line 201 | 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/$(ZSUB) $(ZSUB)
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) $(ZSUB) *.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
230 >        $(RM) $(QUICKLATE) $(ZSUB) *.o *~ Make.temp
231  
232   devclean : distclean
233  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines