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 1356 by gezelter, Mon Jul 19 21:58:37 2004 UTC vs.
Revision 1359 by gezelter, Tue Jul 20 17:07:01 2004 UTC

# Line 108 | Line 108 | MPI_DECLARES= -DIS_MPI
108   # LDFLAGS
109   LDFLAGS=@LDFLAGS@
110  
111 + # LIBOBJS
112 + LIBOBJS=@LIBOBJS@
113 +
114   MPI_DECLARES= -DIS_MPI
115  
116   # include paths starting with "." are all relative to the SUBDIRS!!!
117  
118 < INCLUDES= -I.. -I$(TOP)/../libBASS -I$(TOP)/../libmdtools -I$(TOP)/../third-party
118 > INCLUDES= -I.. -I$(TOP)/../libBASS -I$(TOP)/../libmdtools -I../..
119   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
120   CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
121 < DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) -I$(TOP)/libBASS -I$(TOP)/libmdtools -I$(TOP)/../third-party
121 > DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) -I$(TOP)/libBASS -I$(TOP)/libmdtools -I..
122  
123  
124   SYSBUILD=sysBuild$(EXE)
# Line 134 | Line 137 | LBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB)
137   SRC_DIR := $(PWD)
138  
139   LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
140 < LBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
140 > LBILAYER_LDADD=-L. -lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
141  
142   RBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
143 < RBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
143 > RBILAYER_LDADD=-L. -lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
144  
145   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
146  
# Line 208 | Line 211 | LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
211  
212   LBILAYER_CXX_OBJS := $(LBILAYER_CXX_FILES:.cpp=.o)
213   LBILAYER_OBJS := $(LBILAYER_CXX_OBJS)
214 + LIB_OBJS      := $(LIBOBJS:%.o=  ../$(DIR)/%.o)
215  
216   RBILAYER_CXX_OBJS := $(RBILAYER_CXX_FILES:.cpp=.o)
217   RBILAYER_OBJS := $(RBILAYER_CXX_OBJS)
# Line 230 | Line 234 | latticeBilayer$(EXE): $(LBILAYER_OBJS) $(BUILDER_LIB)
234          $(AR) cr $@ $(BUILDER_LIB_OBJS)
235          $(RANLIB) $@
236  
237 < latticeBilayer$(EXE): $(LBILAYER_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB)
238 <        $(CXX) $(CXXFLAGS) $(LBILAYER_OBJS) -o $@ $(LBILAYER_LDFLAGS) $(LBILAYER_LDADD)
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)
239  
240 < randomBilayer$(EXE): $(RBILAYER_OBJS) $(BUILDER_LIB)  $(BASS_LIB) $(MD_LIB)
241 <        $(CXX) $(CXXFLAGS) $(RBILAYER_OBJS) -o $@ $(RBILAYER_LDFLAGS) $(RBILAYER_LDADD)
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  
243   install : $(LBILAYER)
244          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines