[ViewVC] Diff of: group/trunk/OOPSE/src/Makefile.in

Comparing trunk/OOPSE/src/Makefile.in (file contents):
Revision 834 by gezelter, Tue Oct 28 20:09:45 2003 UTC vs.
Revision 942 by gezelter, Wed Jan 14 15:49:26 2004 UTC

#	Line 46 \| Line 46 \| MPI_INC=@MPI_INC@
46		# MPICH include path
47		MPI_INC=@MPI_INC@
48
49	–	# MPI F90 Module path
50	–	MPI_F90_MODS=@MPI_F90_MODS@
51	–
52	–	# MPI F90 libname
53	–	MPIMODLIBNAME=@MPIMODLIBNAME@
54	–
49		# Location of yacc (or its substitution)
50		YACC=@YACC@
51
#	Line 98 \| Line 92 \| CXXFLAGS_C=@CXXFLAGS@
92		# C++ flags
93		CXXFLAGS_C=@CXXFLAGS@
94
95	+	# C++ template flags
96	+	OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
97	+
98	+	# C++ namespace flag
99	+	EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
100	+
101		# Preprocessor flag for fortran
102		PREPFLAG=@PREPFLAG@
103
#	Line 123 \| Line 123 \| CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
123
124		INCLUDES= -I.. -I../../libBASS -I../../libmdtools
125		MPI_INCLUDES= -I$(MPI_INC)
126	<	CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
126	>	CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
127		DEPFLAGS=$(CFLAGS_C) -I. $(SPRNG_INC) $(MPI_INCLUDES) -I../libBASS -I../libmdtools
128		MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
129
#	Line 139 \| Line 139 \| OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBD
139
140		OOPSE_LDFLAGS= $(LIBS) $(F90LIBS) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
141
142	<	OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPIMODLIBNAME) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
142	>	OOPSE_MPI_LDFLAGS= $(MPI_LIBS) $(F90LIBS) -L$(MPI_LIBDIR) $(MPI_LIB) -L$(SPRNG_LIBDIR) $(SPRNG_LIB)
143
144	+
145		PREFS=-DOOPSE_HOME=\"$(OOPSE_HOME)\"
146
147		obj/%.o: %.cpp

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