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 1083 by gezelter, Fri Oct 20 14:59:05 2006 UTC vs.
Revision 1086 by gezelter, Mon Oct 23 18:21:41 2006 UTC

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

Diff Legend

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