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

Comparing trunk/OOPSE-1.0/utils/sysbuilder/Makefile.in (file contents):
Revision 1359 by gezelter, Tue Jul 20 17:07:01 2004 UTC vs.
Revision 1429 by tim, Wed Jul 28 20:29:49 2004 UTC

# Line 4 | Line 4 | TOP=../..
4   # You should not change anything here.              #
5   #####################################################
6  
7 < TOP=../..
7 > TOP=../../..
8  
9   .SUFFIXES : .cpp .c $(O)
10  
# Line 123 | Line 123 | LBILAYER=latticeBilayer$(EXE)
123  
124   SYSBUILD=sysBuild$(EXE)
125   BUILDER_LIB=libBuilder.a
126 < LBILAYER=latticeBilayer$(EXE)
127 < RBILAYER=randomBilayer$(EXE)
126 > SIMPLEBUILD = simpleBuilder$(EXE)
127 > #LBILAYER=latticeBilayer$(EXE)
128 > #RBILAYER=randomBilayer$(EXE)
129  
130   BASS_LIB=$(TOP)/libBASS/libBASS.a
131   MD_LIB=$(TOP)/libmdtools/libmdtools.a
# Line 136 | Line 137 | LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools
137  
138   SRC_DIR := $(PWD)
139  
140 < LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
141 < LBILAYER_LDADD=-L. -lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
140 > #LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
141 > #LBILAYER_LDADD=-L. -lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
142  
143 < RBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
144 < RBILAYER_LDADD=-L. -lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
143 > #RBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
144 > #RBILAYER_LDADD=-L. -lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
145  
146 + SIMPLEBUILD_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
147 + SIMPLEBUILD_LDADD=-L. -lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
148 +
149   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
150  
151   obj/%.o: %.cpp
# Line 166 | Line 170 | MPIobj/%.o: %.c
170   #       $(DIR)/latticeBuilder.cpp \
171   #       $(DIR)/nanoBuilder.cpp
172  
173 + #simpleBuilder files
174 + SIMPLEBUILD_C_FILES = $(DIR)/simpleBuilderCmd.c
175 + SIMPLEBUILD_CXX_FILES = \
176 +        $(DIR)/simpleBuilder.cpp
177 +
178 +
179 +
180   #latticeBilayer files
181  
182 < LBILAYER_CXX_FILES = $(DIR)/latticeBilayer.cpp
182 > #LBILAYER_CXX_FILES = $(DIR)/latticeBilayer.cpp
183  
184 < RBILAYER_CXX_FILES = $(DIR)/randomBilayer.cpp
184 > #RBILAYER_CXX_FILES = $(DIR)/randomBilayer.cpp
185  
186   # libBuilder files
187  
188   BUILDER_LIB_CXX_FILES = \
189          $(DIR)/MoLocator.cpp \
190 <        $(DIR)/latticeBuilder.cpp
190 >        $(DIR)/Lattice.cpp \
191 >        $(DIR)/BaseLattice.cpp \
192 >        $(DIR)/LatticeCreator.cpp \
193 >        $(DIR)/LatticeFactory.cpp
194  
195  
196   # the sources
# Line 187 | Line 201 | LBILAYER_CXX_SRCS := $(LBILAYER_CXX_FILES)
201   #SYSBUILD_CXX_SRCS := $(SYSBUILD_CXX_FILES)
202   #SYSBUILD_SRCS := $(SYSBUILD_C_SRCS) $(SYSBUILD_CXX_SRCS)
203  
204 < LBILAYER_CXX_SRCS := $(LBILAYER_CXX_FILES)
205 < LBILAYER_SRCS := $(LBILAYER_CXX_SRCS)
204 > #LBILAYER_CXX_SRCS := $(LBILAYER_CXX_FILES)
205 > #LBILAYER_SRCS := $(LBILAYER_CXX_SRCS)
206  
207 < RBILAYER_CXX_SRCS := $(RBILAYER_CXX_FILES)
208 < RBILAYER_SRCS := $(RBILAYER_CXX_SRCS)
207 > #RBILAYER_CXX_SRCS := $(RBILAYER_CXX_FILES)
208 > #RBILAYER_SRCS := $(RBILAYER_CXX_SRCS)
209  
210   BUILDER_LIB_CXX_SRCS := $(BUILDER_LIB_CXX_FILES)
211   BUILDER_LIB_SRCS := $(BUILDER_LIB_CXX_SRCS)
212  
213 < C_CXX_SRCS :=  $(LBILAYER_SRCS) $(BUILDER_LIB_SRCS) $(RBILAYER_SRCS)
213 > SIMPLEBUILD_C_SRCS := $(SIMPLEBUILD_C_FILES)
214 > SIMPLEBUILD_CXX_SRCS := $(SIMPLEBUILD_CXX_FILES)
215 > SIMPLEBUILD_SRCS := $(SIMPLEBUILD_C_FILES) $(SIMPLEBUILD_C_FILES)
216  
217 + C_CXX_SRCS :=  $(SIMPLEBUILD_SRCS) $(BUILDER_LIB_SRCS)
218 +
219   C_SRCS :=
220 < CXX_SRCS := $(LBILAYER_CXX_SRCS) $(BUILDER_LIB_CXX_SRCS) $(RBILAYER_CXX_SRCS)
220 > CXX_SRCS := $(SIMPLEBUILD_CXX_SRCS) $(BUILDER_LIB_CXX_SRCS)
221  
222   #the objects
223  
# Line 209 | Line 227 | LBILAYER_CXX_OBJS := $(LBILAYER_CXX_FILES:.cpp=.o)
227   #SYSBUILD_CXX_OBJS := $(SYSBUILD_CXX_FILES:.cpp=.o)
228   #SYSBUILD_OBJS := $(SYSBUILD_C_OBJS) $(SYSBUILD_CXX_OBJS)
229  
230 < LBILAYER_CXX_OBJS := $(LBILAYER_CXX_FILES:.cpp=.o)
231 < LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
232 < LIB_OBJS      := $(LIBOBJS:%.o=  ../$(DIR)/%.o)
230 > #LBILAYER_CXX_OBJS := $(LBILAYER_CXX_FILES:.cpp=.o)
231 > #LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
232 > #LIB_OBJS      := $(LIBOBJS:%.o=  ../$(DIR)/%.o)
233  
234 < RBILAYER_CXX_OBJS := $(RBILAYER_CXX_FILES:.cpp=.o)
235 < RBILAYER_OBJS := $(RBILAYER_CXX_OBJS)
234 > #RBILAYER_CXX_OBJS := $(RBILAYER_CXX_FILES:.cpp=.o)
235 > #RBILAYER_OBJS := $(RBILAYER_CXX_OBJS)
236  
237   BUILDER_LIB_CXX_OBJS := $(BUILDER_LIB_CXX_FILES:.cpp=.o)
238   BUILDER_LIB_OBJS := $(BUILDER_LIB_CXX_OBJS)
239  
240 + SIMPLEBUILD_C_OBJS := $(SIMPLEBUILD_C_SRCS:.c=.o)
241 + SIMPLEBUILD_CXX_OBJS := $(SIMPLEBUILD_CXX_SRCS:.cpp=.o)
242 + SIMPLEBUILD_OBJS := $(SIMPLEBUILD_C_OBJS) $(SIMPLEBUILD_CXX_OBJS)
243 +
244   LIBSUBDIRS = \
245          obj
246  
247 < all : $(BUILDER_LIB) $(LBILAYER) $(RBILAYER)
247 > all : $(BUILDER_LIB) $(SIMPLEBUILD) $(RBILAYER)
248  
249   depend: Make.dep
250  
251   #sysBuild$(EXE) : $(SYSBUILD_OBJS) $(BASS_LIB) $(MD_LIB)
252   #       $(CXX) $(CXXFLAGS) $(SYSBUILD_OBJS) -o $@ $(SYSBUILD_LDFLAGS) $(SYSBUILD_LDADD)
253  
254 +
255 +
256 + simpleBuilder$(EXE): $(SIMPLEBUILD_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB) $(LIB_OBJS)
257 +        $(CXX) $(CXXFLAGS) $(SIMPLEBUILD_OBJS) $(LIB_OBJS) -o $@ $(SIMPLEBUILD_LDFLAGS) $(SIMPLEBUILD_LDADD)
258 +
259   libBuilder.a: $(BUILDER_LIB_OBJS)
260          $(RM) $@
261          $(AR) cr $@ $(BUILDER_LIB_OBJS)
262          $(RANLIB) $@
263  
237 – latticeBilayer$(EXE): $(LBILAYER_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB) $(LIB_OBJS)
238 –        $(CXX) $(CXXFLAGS) $(LBILAYER_OBJS) $(LIB_OBJS) -o $@ $(LBILAYER_LDFLAGS) $(LBILAYER_LDADD)
264  
240 – randomBilayer$(EXE): $(RBILAYER_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB) $(LIB_OBJS)
241 –        $(CXX) $(CXXFLAGS) $(RBILAYER_OBJS) $(LIB_OBJS) -o $@ $(RBILAYER_LDFLAGS) $(RBILAYER_LDADD)
242 –
265   install : $(LBILAYER)
266          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin
267 <        $(INSTALL_PROGRAM) -s $(LBILAYER) $(OOPSE_HOME)/bin/$(LBILAYER)
246 <        $(INSTALL_PROGRAM) -s $(RBILAYER) $(OOPSE_HOME)/bin/$(RBILAYER)
267 >        $(INSTALL_PROGRAM) -s $(SIMPLEBUILD) $(OOPSE_HOME)/bin/$(SIMPLEBUILD)
268  
269  
270   tests : dummy
# Line 254 | Line 275 | links : $(OOPSE_HOME)/bin/$(LBILAYER)  
275  
276   links : $(OOPSE_HOME)/bin/$(LBILAYER)  
277          $(MKINSTALLDIRS) $(PREFIX)/bin
278 <        cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(LBILAYER) $(LBILAYER)
258 <        cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(RBILAYER) $(RBILAYER)
278 >        cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(LBILAYER) $(SIMPLEBUILD)
279  
280   clean : dummy
281          for i in $(LIBSUBDIRS); do \
282            (cd $$i; $(RM) *.o) || exit 1; \
283          done
284 <        $(RM) $(LBILAYER) $(RBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
284 >        $(RM) $(SIMPLEBUILD) $(BUILDER_LIB) *.o *~ Make.temp
285  
286   distclean : dummy
287          for i in $(LIBSUBDIRS); do \
288            (cd $$i; $(RM) *.o) || exit 1; \
289          done
290 <        $(RM) $(LBILAYER) $(RBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
290 >        $(RM) $(SIMPLEBUILD) $(BUILDER_LIB) *.o *~ Make.temp
291  
292   devclean : distclean
293  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines