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 820 by gezelter, Thu Sep 25 16:42:34 2003 UTC vs.
Revision 821 by mmeineke, Fri Oct 24 22:17:45 2003 UTC

# Line 4 | Line 4 | TOP=../..
4   # You should not change anything here.              #
5   #####################################################
6  
7 < TOP=../..
7 > TOP=@abs_top_builddir@
8  
9   .SUFFIXES : .cpp .c $(O)
10  
# Line 112 | Line 112 | INCLUDES= -I.. -I../../../libBASS -I../../../libmdtool
112  
113   # include paths starting with "." are all relative to the SUBDIRS!!!
114  
115 < INCLUDES= -I.. -I../../../libBASS -I../../../libmdtools
116 < MPI_INCLUDES= $(MPI_INC) $(MPI_INC)/mpi2c++
115 > INCLUDES= -I.. -I$(TOP)/libBASS -I$(TOP)/libmdtools
116   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
117   CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
118 < DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../../libBASS -I../../libmdtools
120 < MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
118 > DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) -I$(TOP)/libBASS -I$(TOP)/libmdtools
119  
120  
121   SYSBUILD=sysBuild$(EXE)
122 + BUILDER_LIB=libBuilder.a
123 + LBILAYER=latticeBilayer$(EXE)
124  
125   BASS_LIB=$(TOP)/libBASS/libBASS.a
126 – BASS_MPI_LIB=$(TOP)/libBASS/libBASS_MPI.a
126   MD_LIB=$(TOP)/libmdtools/libmdtools.a
128 – MD_MPI_LIB=$(TOP)/libmdtools/libmdtools_MPI.a
127   LIBS=$(BASS_LIB) $(MD_LIB)
130 – MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
128  
129 < SYSBUILD_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
130 < SYSBUILD_LDADD=-lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
129 > #SYSBUILD_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
130 > #SYSBUILD_LDADD=-lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
131  
132 +
133   SRC_DIR := $(PWD)
134  
135 + LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR) -L$(SRC_DIR)
136 + LBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
137 +
138 +
139   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
140  
141   obj/%.o: %.cpp
# Line 150 | Line 152 | SYSBUILD_C_FILES = $(DIR)/cmdline.c
152  
153   # sysBuilder files
154  
155 < SYSBUILD_C_FILES = $(DIR)/cmdline.c
156 < SYSBUILD_CXX_FILES = \
157 <        $(DIR)/sysBuild.cpp \
158 <        $(DIR)/bilayerSys.cpp \
155 > #SYSBUILD_C_FILES = $(DIR)/cmdline.c
156 > #SYSBUILD_CXX_FILES = \
157 > #       $(DIR)/sysBuild.cpp \
158 > #       $(DIR)/bilayerSys.cpp \
159 > #       $(DIR)/MoLocator.cpp \
160 > #       $(DIR)/latticeBuilder.cpp \
161 > #       $(DIR)/nanoBuilder.cpp
162 >
163 > #latticeBilayer files
164 >
165 > LBILAYER_CXX_FILES = $(DIR)/latticeBilayer.cpp
166 >
167 > # libBuilder files
168 >
169 > BUILDER_LIB_CXX_FILES = \
170          $(DIR)/MoLocator.cpp \
171 <        $(DIR)/latticeBuilder.cpp \
172 <        $(DIR)/nanoBuilder.cpp
171 >        $(DIR)/QuickBass.cpp \
172 >        $(DIR)/latticeBuilder.cpp
173  
174 +
175   # the sources
176  
177   DIR:=.
178  
179 < SYSBUILD_C_SRCS := $(SYSBUILD_C_FILES)
180 < SYSBUILD_CXX_SRCS := $(SYSBUILD_CXX_FILES)
181 < SYSBUILD_SRCS := $(SYSBUILD_C_SRCS) $(SYSBUILD_CXX_SRCS)
179 > #SYSBUILD_C_SRCS := $(SYSBUILD_C_FILES)
180 > #SYSBUILD_CXX_SRCS := $(SYSBUILD_CXX_FILES)
181 > #SYSBUILD_SRCS := $(SYSBUILD_C_SRCS) $(SYSBUILD_CXX_SRCS)
182  
183 < C_CXX_SRCS :=  $(SYSBUILD_C_SRCS) $(SYSBUILD_CXX_SRCS)
183 > LBILAYER_CXX_SRCS := $(LBILAYER_CXX_FILES)
184 > LBILAYER_SRCS := $(LBILAYER_CXX_SRCS)
185  
186 + BUILDER_LIB_CXX_SRCS := $(BUILDER_LIB_CXX_FILES)
187 + BUILDER_LIB_SRCS := $(BUILDER_LIB_CXX_SRCS)
188 +
189 + C_CXX_SRCS :=  $(LBILAYER_SRCS) $(BUILDER_LIB_SRCS)
190 +
191 + C_SRCS :=
192 + CXX_SRCS := $(LBILAYER_CXX_SRCS) $(BUILDER_LIB_CXX_SRCS)
193 +
194   #the objects
195  
196   DIR:=obj
197  
198 < SYSBUILD_C_OBJS := $(SYSBUILD_C_FILES:.c=.o)
199 < SYSBUILD_CXX_OBJS := $(SYSBUILD_CXX_FILES:.cpp=.o)
200 < SYSBUILD_OBJS := $(SYSBUILD_C_OBJS) $(SYSBUILD_CXX_OBJS)
198 > #SYSBUILD_C_OBJS := $(SYSBUILD_C_FILES:.c=.o)
199 > #SYSBUILD_CXX_OBJS := $(SYSBUILD_CXX_FILES:.cpp=.o)
200 > #SYSBUILD_OBJS := $(SYSBUILD_C_OBJS) $(SYSBUILD_CXX_OBJS)
201  
202 < DIR:=MPIobj
202 > LBILAYER_CXX_OBJS := $(LBILAYER_CXX_FILES:.cpp=.o)
203 > LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
204  
205 < SYSBUILD_C_MPIOBJS := $(SYSBUILD_C_FILES:.c=.o)
206 < SYSBUILD_CXX_MPIOBJS := $(SYSBUILD_CXX_FILES:.cpp=.o)
183 < SYSBUILD_MPIOBJS := $(SYSBUILD_C_MPIOBJS) $(SYSBUILD_CXX_MPIOBJS)
205 > BUILDER_LIB_CXX_OBJS := $(BUILDER_LIB_CXX_FILES:.cpp=.o)
206 > BUILDER_LIB_OBJS := $(BUILDER_LIB_CXX_OBJS)
207  
208   LIBSUBDIRS = \
209 <        obj \
187 <        MPIobj
209 >        obj
210  
211 < all : $(SYSBUILD)
211 > all : $(BUILDER_LIB) $(LBILAYER)
212  
213   depend: Make.dep
214  
215 < sysBuild$(EXE) : $(SYSBUILD_OBJS) $(BASS_LIB) $(MD_LIB)
216 <        $(CXX) $(CXXFLAGS) $(SYSBUILD_OBJS) -o $@ $(SYSBUILD_LDFLAGS) $(SYSBUILD_LDADD)
215 > #sysBuild$(EXE) : $(SYSBUILD_OBJS) $(BASS_LIB) $(MD_LIB)
216 > #       $(CXX) $(CXXFLAGS) $(SYSBUILD_OBJS) -o $@ $(SYSBUILD_LDFLAGS) $(SYSBUILD_LDADD)
217  
218 < install : $(SYSBUILD)
218 > libBuilder.a: $(BUILDER_LIB_OBJS)
219 >        $(RM) $@
220 >        $(AR) cr $@ $(BUILDER_LIB_OBJS)
221 >        $(RANLIB) $@
222 >
223 > latticeBilayer$(EXE): $(LBILAYER_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB)
224 >        $(CXX) $(CXXFLAGS) $(LBILAYER_OBJS) -o $@ $(LBILAYER_LDFLAGS) $(LBILAYER_LDADD)
225 >
226 > install : $(LBILAYER)
227          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin
228 <        $(INSTALL_PROGRAM) -s $(SYSBUILD) $(OOPSE_HOME)/bin/$(SYSBUILD)
228 >        $(INSTALL_PROGRAM) -s $(LBILAYER) $(OOPSE_HOME)/bin/$(LBILAYER)
229  
230  
231   tests : dummy
232  
233  
234 < $(OOPSE_HOME)/bin/$(SYSBUILD) : $(SYSBUILD)
234 > $(OOPSE_HOME)/bin/$(LBILAYER) : $(LBILAYER)
235          $(MAKE) install
236  
237 < links : $(OOPSE_HOME)/bin/$(SYSBUILD)  
237 > links : $(OOPSE_HOME)/bin/$(LBILAYER)  
238          $(MKINSTALLDIRS) $(PREFIX)/bin
239 <        cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(SYSBUILD) $(SYSBUILD)
239 >        cd $(PREFIX)/bin; $(LN_S) -f $(OOPSE_HOME)/bin/$(LBILAYER) $(LBILAYER)
240  
241   clean : dummy
242          for i in $(LIBSUBDIRS); do \
243            (cd $$i; $(RM) *.o) || exit 1; \
244          done
245 <        $(RM) $(SYSBUILD) *.o *~ Make.temp
245 >        $(RM) $(LBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
246  
247   distclean : dummy
248          for i in $(LIBSUBDIRS); do \
249            (cd $$i; $(RM) *.o) || exit 1; \
250          done
251 <        $(RM) $(SYSBUILD) *.o *~ Make.temp
251 >        $(RM) $(LBILAYER) $(BUILDER_LIB) *.o *~ Make.temp
252  
253   devclean : distclean
254  
255   Make.dep :
256          echo "# DO NOT DELETE THIS LINE - used by make depend" > Make.dep
257 <        $(CC) $(DEPFLAGS) -MM $(SYSBUILD_C_SRCS) \
257 >        $(CC) $(DEPFLAGS) -MM $(C_SRCS) \
258                  | sed 's/\.o:/\$$(O)\ :/g' > Make.temp
259 <        $(CXX) $(DEPFLAGS) -MM $(SYSBUILD_CXX_SRCS) \
259 >        $(CXX) $(DEPFLAGS) -MM $(CXX_SRCS) \
260                  | sed 's/\.o:/\$$(O)\ :/g' >> Make.temp
261          cat Make.temp | sed 's/^[a-zA-Z0-9]/obj\/&/g' >> Make.dep
262          cat Make.temp | sed 's/^[a-zA-Z0-9]/MPIobj\/&/g' >> Make.dep

Diff Legend

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