ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-4/make/Makefile.in
(Generate patch)

Comparing trunk/OOPSE-4/make/Makefile.in (file contents):
Revision 1557 by tim, Mon Oct 11 21:13:46 2004 UTC vs.
Revision 1635 by chrisfen, Fri Oct 22 22:53:40 2004 UTC

# Line 285 | Line 285 | COptions               = $(FrcDeclare)
285   JniOptions             =
286   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
287                           -sourcepath $(SourceDir)
288 < COptions               = $(FrcDeclare)
289 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
290 < CppOptions             = $(FrcDeclare)
291 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
288 > COptions               = $(FrcDeclare) @CFLAGS@
289 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
290 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
291 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
292   FortranOptions         =
293   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
294   F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines