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

Comparing trunk/OOPSE/utils/sysbuilder/Makefile.in (file contents):
Revision 875 by gezelter, Tue Oct 28 20:42:24 2003 UTC vs.
Revision 876 by mmeineke, Wed Dec 10 16:52:46 2003 UTC

# Line 121 | Line 121 | LBILAYER=latticeBilayer$(EXE)
121   SYSBUILD=sysBuild$(EXE)
122   BUILDER_LIB=libBuilder.a
123   LBILAYER=latticeBilayer$(EXE)
124 + RBILAYER=randomBilayer$(EXE)
125  
126   BASS_LIB=$(TOP)/libBASS/libBASS.a
127   MD_LIB=$(TOP)/libmdtools/libmdtools.a
# Line 135 | Line 136 | LBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB)
136   LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR) -L$(SRC_DIR)
137   LBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
138  
139 + RBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR) -L$(SRC_DIR)
140 + RBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
141  
142   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
143  
# Line 164 | Line 167 | LBILAYER_CXX_FILES = $(DIR)/latticeBilayer.cpp
167  
168   LBILAYER_CXX_FILES = $(DIR)/latticeBilayer.cpp
169  
170 + RBILAYER_CXX_FILES = $(DIR)/randomBilayer.cpp
171 +
172   # libBuilder files
173  
174   BUILDER_LIB_CXX_FILES = \
# Line 182 | Line 187 | LBILAYER_SRCS := $(LBILAYER_CXX_SRCS)
187   LBILAYER_CXX_SRCS := $(LBILAYER_CXX_FILES)
188   LBILAYER_SRCS := $(LBILAYER_CXX_SRCS)
189  
190 + RBILAYER_CXX_SRCS := $(RBILAYER_CXX_FILES)
191 + RBILAYER_SRCS := $(RBILAYER_CXX_SRCS)
192 +
193   BUILDER_LIB_CXX_SRCS := $(BUILDER_LIB_CXX_FILES)
194   BUILDER_LIB_SRCS := $(BUILDER_LIB_CXX_SRCS)
195  
196 < C_CXX_SRCS :=  $(LBILAYER_SRCS) $(BUILDER_LIB_SRCS)
196 > C_CXX_SRCS :=  $(LBILAYER_SRCS) $(BUILDER_LIB_SRCS) $(RBILAYER_SRCS)
197  
198   C_SRCS :=
199 < CXX_SRCS := $(LBILAYER_CXX_SRCS) $(BUILDER_LIB_CXX_SRCS)
199 > CXX_SRCS := $(LBILAYER_CXX_SRCS) $(BUILDER_LIB_CXX_SRCS) $(RBILAYER_CXX_SRCS)
200  
201   #the objects
202  
# Line 200 | Line 208 | LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
208  
209   LBILAYER_CXX_OBJS := $(LBILAYER_CXX_FILES:.cpp=.o)
210   LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
211 +
212 + RBILAYER_CXX_OBJS := $(RBILAYER_CXX_FILES:.cpp=.o)
213 + RBILAYER_OBJS := $(RBILAYER_CXX_OBJS)
214  
215   BUILDER_LIB_CXX_OBJS := $(BUILDER_LIB_CXX_FILES:.cpp=.o)
216   BUILDER_LIB_OBJS := $(BUILDER_LIB_CXX_OBJS)
# Line 207 | Line 218 | LIBSUBDIRS = \
218   LIBSUBDIRS = \
219          obj
220  
221 < all : $(BUILDER_LIB) $(LBILAYER)
221 > all : $(BUILDER_LIB) $(LBILAYER) $(RBILAYER)
222  
223   depend: Make.dep
224  
# Line 222 | Line 233 | latticeBilayer$(EXE): $(LBILAYER_OBJS) $(BUILDER_LIB)
233   latticeBilayer$(EXE): $(LBILAYER_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB)
234          $(CXX) $(CXXFLAGS) $(LBILAYER_OBJS) -o $@ $(LBILAYER_LDFLAGS) $(LBILAYER_LDADD)
235  
236 + randomBilayer$(EXE): $(RBILAYER_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB)
237 +        $(CXX) $(CXXFLAGS) $(RBILAYER_OBJS) -o $@ $(RBILAYER_LDFLAGS) $(RBILAYER_LDADD)
238 +
239   install : $(LBILAYER)
240          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin
241          $(INSTALL_PROGRAM) -s $(LBILAYER) $(OOPSE_HOME)/bin/$(LBILAYER)
242 +        $(INSTALL_PROGRAM) -s $(RBILAYER) $(OOPSE_HOME)/bin/$(RBILAYER)
243  
244  
245   tests : dummy
# Line 236 | Line 251 | links : $(OOPSE_HOME)/bin/$(LBILAYER)  
251   links : $(OOPSE_HOME)/bin/$(LBILAYER)  
252          $(MKINSTALLDIRS) $(PREFIX)/bin
253          cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(LBILAYER) $(LBILAYER)
254 +        cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(RBILAYER) $(RBILAYER)
255  
256   clean : dummy
257          for i in $(LIBSUBDIRS); do \
258            (cd $$i; $(RM) *.o) || exit 1; \
259          done
260 <        $(RM) $(LBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
260 >        $(RM) $(LBILAYER) $(RBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
261  
262   distclean : dummy
263          for i in $(LIBSUBDIRS); do \
264            (cd $$i; $(RM) *.o) || exit 1; \
265          done
266 <        $(RM) $(LBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
266 >        $(RM) $(LBILAYER) $(RBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
267  
268   devclean : distclean
269  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines