ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/make/Makefile.in
(Generate patch)

Comparing trunk/make/Makefile.in (file contents):
Revision 1251 by chuckv, Wed Jun 4 15:38:15 2008 UTC vs.
Revision 1379 by gezelter, Thu Oct 22 14:09:13 2009 UTC

# Line 137 | Line 137 | LinkOptions = \
137   LinkOptions = \
138          @LDFLAGS@ \
139          @FCLIBS@ \
140 <        @CXXFLAGS@  \
141 <        @CGAL_LIBS@
140 >        @CXXFLAGS@
141  
142  
143  
144   ParallelLinkOptions = \
145          @LDFLAGS@ \
146          @FCLIBS@ \
147 <        @CXXFLAGS@ \
149 <        @CGAL_LIBS@
147 >        @CXXFLAGS@
148  
149   #---------------------------------------------------------------------------
150   #
# Line 403 | Line 401 | CParallelOptions       = $(FrcDeclare) $(SingleDeclare
401                           -sourcepath $(SourceDir)
402   COptions               = $(FrcDeclare) $(SingleDeclare) @CFLAGS@
403   CParallelOptions       = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@
404 < CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@ @CGAL_CPPFLAGS@
405 < CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@ @CGAL_CPPFLAGS@
404 > CppOptions             = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@
405 > CppParallelOptions     = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@
406   ifeq "$(UseSingle)" "yes"
407   FortranOptions         =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@
408   FortranParallelOptions =  @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@

Diff Legend

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