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

Comparing trunk/OOPSE-1.0/utils/Makefile.in (file contents):
Revision 1355 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@
37  
38   # SPRNG include path
39 < SPRNG_INC=@SPRNG_INC@
39 > SPRNG_INC_DIR=@SPRNG_INC_DIR@
40  
41   # MPICH library path
42   MPI_LIBDIR=@MPI_LIBDIR@
# Line 53 | Line 53 | F90LIBS = @F90LIBS@
53   # Compiler dependent Fortran module
54   F90LIBS = @F90LIBS@
55  
56 + # Other libraries? (liberty)
57 + OTHERLIBS=@OTHERLIBS@
58 +
59   # Location of yacc (or its substitution)
60   YACC=@YACC@
61  
# Line 121 | Line 124 | DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES)
124   MPI_INCLUDES= $(MPI_INC)
125   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
126   CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
127 < DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools -I../../third-party
127 > DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) $(MPI_INCLUDES) -I../libBASS -I../libmdtools -I../../third-party
128   MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
129  
130   QUICKLATE=quickLate$(EXE)
# Line 134 | Line 137 | LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG
137   LIBS=$(BASS_LIB) $(MD_LIB)
138   MPI_LIBS=$(BASS_MPI_LIB) $(MD_MPI_LIB)
139  
140 < LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIBDIR)
140 > LDFLAGS=-L$(TOP)/libBASS -L$(TOP)/libmdtools -L$(SPRNG_LIB_DIR)
141   LDADD=-lmdtools -lBASS -lsprng $(F90LIBS)
142  
143   SRC_DIR := $(PWD)
# Line 142 | Line 145 | obj/%.o: %.cpp
145   PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
146  
147   obj/%.o: %.cpp
148 <        cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
148 >        cd obj; $(CXX) $(CXXFLAGS) -c ../$<
149  
150   MPIobj/%.o: %.cpp
151 <        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c $(SRC_DIR)/$<
151 >        cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c ../$<
152  
153   obj/%.o: %.c
154 <        cd obj; $(CC) $(CFLAGS) -c $(SRC_DIR)/$<
154 >        cd obj; $(CC) $(CFLAGS) -c ../$<
155  
156   MPIobj/%.o: %.c
157 <        cd MPIobj; $(CC) $(MPI_CFLAGS) -c $(SRC_DIR)/$<
157 >        cd MPIobj; $(CC) $(MPI_CFLAGS) -c ../$<
158  
159  
160   # quicklate files
# Line 197 | Line 200 | Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB
200          $(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(LDFLAGS) $(LDADD)
201  
202   Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB)
203 <        $(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) -o $@ $(LDFLAGS) $(LDADD)
203 >        $(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) $(OTHERLIBS) -o $@ $(LDFLAGS) $(LDADD)
204  
205   install : $(QUICKLATE) $(DUMP2XYZ)
206          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines