[ViewVC] Diff of: OpenMD/branches/devel

Comparing trunk/make/Makefile.in (file contents):
Revision 1167 by gezelter, Fri Jul 13 14:20:08 2007 UTC vs.
Revision 1193 by chuckv, Thu Dec 6 19:51:02 2007 UTC

#	Line 105 \| Line 105 \| LibraryDirs = \
105		LibraryDirs = \
106		@MPI_LIB_DIR@ \
107		@FFTW_LIB_DIR@ \
108	+	@CGAL_INC_DIR@ \
109		@ZLIB_LIB_DIR@
110
111		Libraries = \
#	Line 112 \| Line 113 \| Libraries = \
113		@MPI_LIB@ \
114		@MPI_F90_LIB@ \
115		@FFTW_LIBS@ \
116	+	@CGAL_LIBS@ \
117		@ZLIB@
118
119		OopseHome = @OOPSE_HOME@
#	Line 143 \| Line 145 \| ParallelLinkOptions = \
145		@FCLIBS@ \
146		@CXXFLAGS@
147
146	–
148		#---------------------------------------------------------------------------
149		#
150		# Directories
#	Line 399 \| Line 400 \| CParallelOptions = $(FrcDeclare) $(SingleDeclare
400		-sourcepath $(SourceDir)
401		COptions = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
402		CParallelOptions = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
403	<	CppOptions = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
404	<	CppParallelOptions = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
403	>	CppOptions = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@ @CGAL_CPPFLAGS@
404	>	CppParallelOptions = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@ @CGAL_CPPFLAGS@
405		ifeq "$(UseSingle)" "yes"
406		FortranOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
407		FortranParallelOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@

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