ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/make/Makefile
(Generate patch)

Comparing trunk/OOPSE-2.0/make/Makefile (file contents):
Revision 1512 by tim, Wed Sep 29 21:54:03 2004 UTC vs.
Revision 1514 by tim, Thu Sep 30 15:41:35 2004 UTC

# Line 245 | Line 245 | MakeOptions            = -k -s
245   Lex                    = flex
246  
247  
248 < MakeOptions            = -k -s
248 > MakeOptions            = -k
249   MakeDependOptions      =
250   StaticArchiverOptions  = rc
251   DynamicArchiverOptions = -shared
# Line 294 | Line 294 | $(PackageTargetDir)/%.o : %.c
294  
295   # .c -> .o
296   $(PackageTargetDir)/%.o : %.c
297 <        $(Print) $@
298 <        $(Print) $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
299 <        @$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
297 >        $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
298  
299   %.o : %.c
300          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
301  
302   # .cpp -> .o
303   $(PackageTargetDir)/%.o : %.cpp
306        $(Print) $@
307        $(Print) $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
304          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
305  
306   %.o : %.cpp
# Line 321 | Line 317 | $(PackageTargetDir)/%.o : %.F90
317  
318   # .F90 -> .o
319   $(PackageTargetDir)/%.o : %.F90
320 <        $(Print) $@
325 <        $(Print) $(F90Compiler) $(F90Options) -c $< -o $@
326 <        @$(F90Compiler) $(F90Options) -c $< -o $@
320 >        $(F90Compiler) $(F90Options) -c $< -o $@
321  
322   %.o : %.F90
323          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
# Line 455 | Line 449 | _cleanall :
449          $(Print) Done clean.    
450  
451   _cleanall :
452 <        $(Delete) $(PackageTargetDir)/* \
452 >        $(Delete) $(ObjectFiles) $(ParallelObjectFiles)
453 >
454 > # make distclean
455 > distclean : $(PackageListLoop)
456 >        $(Print) Done clean.    
457 >
458 > _distcleanall :
459 >        $(Delete) $(ObjectFiles) \
460 >                  $(ParallelObjectFiles) \
461                    $(JarFile) \
462                    $(SharedLibrary) \
463                    $(StaticLibrary) \
464 +                  $(ParallelSharedLibrary) \
465 +                  $(ParallelStaticLibrary) \
466                    $(Executable) \
467 +                  $(ParallelExecutable) \
468                    $(DependencyFile)
469  
470  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines