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 1334 by gezelter, Fri Jul 16 18:58:03 2004 UTC vs.
Revision 1359 by gezelter, Tue Jul 20 17:07:01 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 111 | Line 111 | LDFLAGS=@LDFLAGS@
111   # LDFLAGS
112   LDFLAGS=@LDFLAGS@
113  
114 + # LIBOBJS
115 + LIBOBJS=@LIBOBJS@
116 +
117   # First do compile-time flags:
118  
119   MPI_DECLARES= -DIS_MPI
# 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
127 > DEPFLAGS=$(CFLAGS_C) -I. -I$(SPRNG_INC_DIR) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
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 172 | Line 175 | QUICK_C_OBJS :=        $(QUICK_C_FILES:.c=.o)
175   #the objects
176  
177   DIR:=obj
178 < QUICK_C_OBJS := $(QUICK_C_FILES:.c=.o)
179 < QUICK_OBJS := $(QUICK_C_OBJS)
180 < DUMP2XYZ_C_OBJS :=$(DUMP2XYZ_C_FILES:.c=.o)
181 < DUMP2XYZ_CXX_OBJS :=$(DUMP2XYZ_CXX_FILES:.cpp=.o)
182 < DUMP2XYZ_OBJS := $(DUMP2XYZ_CXX_OBJS) $(DUMP2XYZ_C_OBJS)
178 > QUICK_C_OBJS      := $(QUICK_C_FILES:.c=.o)
179 > QUICK_OBJS        := $(QUICK_C_OBJS)
180 > DUMP2XYZ_C_OBJS   := $(DUMP2XYZ_C_FILES:.c=.o)
181 > DUMP2XYZ_CXX_OBJS := $(DUMP2XYZ_CXX_FILES:.cpp=.o)
182 > DUMP2XYZ_OBJS     := $(DUMP2XYZ_CXX_OBJS) $(DUMP2XYZ_C_OBJS)
183 > LIB_OBJS          := $(LIBOBJS:%.o=  $(DIR)/%.o)
184  
185   DIR:=MPIobj
186 < QUICK_C_MPIOBJS :=      $(QUICK_C_FILES:.c=.o)
187 < QUICK_MPIOBJS := $(QUICK_C_MPIOBJS)
188 < DUMP2XYZ_C_MPIOBJS :=   $(DUMP2XYZ_C_FILES:.c=.o)
186 > QUICK_C_MPIOBJS      := $(QUICK_C_FILES:.c=.o)
187 > QUICK_MPIOBJS        := $(QUICK_C_MPIOBJS)
188 > DUMP2XYZ_C_MPIOBJS   := $(DUMP2XYZ_C_FILES:.c=.o)
189   DUMP2XYZ_CXX_MPIOBJS := $(DUMP2XYZ_CXX_FILES:.cpp=.o)
190 < DUMP2XYZ_MPIOBJS := $(DUMP2XYZ_C_MPIOBJS) $(DUMP2XYZ_CXX_MPIOBJS)
190 > DUMP2XYZ_MPIOBJS     := $(DUMP2XYZ_C_MPIOBJS) $(DUMP2XYZ_CXX_MPIOBJS)
191 > LIB_MPIOBJS          := $(LIBOBJS:%.o=  $(DIR)/%.o)
192  
193   LIBSUBDIRS = \
194          obj \
# Line 196 | Line 201 | Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB
201   quickLate$(EXE) : $(QUICK_OBJS) $(BASS_LIB) $(MD_LIB)
202          $(CC) $(CFLAGS) $(QUICK_OBJS) -o $@ $(LDFLAGS) $(LDADD)
203  
204 < Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB)
205 <        $(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) -o $@ $(LDFLAGS) $(LDADD)
204 > Dump2XYZ$(EXE) : $(DUMP2XYZ_OBJS) $(BASS_LIB) $(MD_LIB) $(LIB_OBJS)
205 >        $(CXX) $(CXXFLAGS) $(DUMP2XYZ_OBJS) $(LIB_OBJS) -o $@ $(LDFLAGS) $(LDADD)
206  
207   install : $(QUICKLATE) $(DUMP2XYZ)
208          $(MKINSTALLDIRS) $(OOPSE_HOME)/bin

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines