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 1347 by gezelter, Mon Jul 19 16:32:46 2004 UTC vs.
Revision 1356 by gezelter, Mon Jul 19 21:58:37 2004 UTC

# Line 30 | Line 30 | SPRNG_LIBDIR=@SPRNG_LIBDIR@
30   SAMPLE_SIM_DIR=@OOPSE_HOME@/share/samples/
31  
32   # SPRNG library path
33 < SPRNG_LIBDIR=@SPRNG_LIBDIR@
33 > SPRNG_LIB_DIR=@SPRNG_LIB_DIR@
34  
35   # SPRNG library
36   SPRNG_LIB=@SPRNG_LIB@
# Line 115 | Line 115 | DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) -I$(TOP)/libBASS
115   INCLUDES= -I.. -I$(TOP)/../libBASS -I$(TOP)/../libmdtools -I$(TOP)/../third-party
116   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
117   CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
118 < DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) -I$(TOP)/libBASS -I$(TOP)/libmdtools -I$(TOP)/../third-party
118 > DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) -I$(TOP)/libBASS -I$(TOP)/libmdtools -I$(TOP)/../third-party
119  
120  
121   SYSBUILD=sysBuild$(EXE)
# Line 127 | Line 127 | LIBS=$(BASS_LIB) $(MD_LIB)
127   MD_LIB=$(TOP)/libmdtools/libmdtools.a
128   LIBS=$(BASS_LIB) $(MD_LIB)
129  
130 < #SYSBUILD_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
130 > #SYSBUILD_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR)
131   #SYSBUILD_LDADD=-lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
132  
133  
134   SRC_DIR := $(PWD)
135  
136 < LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR) -L$(SRC_DIR)
136 > LBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -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)
139 > RBILAYER_LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR) -L$(SRC_DIR)
140   RBILAYER_LDADD=-lBuilder -lmdtools -lBASS $(SPRNG_LIB) $(F90LIBS)
141  
142   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
143  
144   obj/%.o: %.cpp
145 <        cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
145 >        cd obj; $(CXX) $(CXXFLAGS) -c ../$<
146  
147   MPIobj/%.o: %.cpp
148 <        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c $(SRC_DIR)/$<
148 >        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c ../$<
149  
150   obj/%.o: %.c
151 <        cd obj; $(CC) $(CFLAGS) -c $(SRC_DIR)/$<
151 >        cd obj; $(CC) $(CFLAGS) -c ../$<
152  
153   MPIobj/%.o: %.c
154 <        cd MPIobj; $(CC) $(MPI_CFLAGS) -c $(SRC_DIR)/$<
154 >        cd MPIobj; $(CC) $(MPI_CFLAGS) -c ../$<
155  
156   # sysBuilder files
157  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines