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

Comparing trunk/OOPSE-4/make/Makefile.in (file contents):
Revision 1535 by gezelter, Wed Oct 6 21:22:43 2004 UTC vs.
Revision 1539 by tim, Wed Oct 6 22:20:47 2004 UTC

# Line 272 | Line 272 | Ranlib                 = @RANLIB@
272   Yacc                   = @YACC@
273   Lex                    = @LEX@
274   Ranlib                 = @RANLIB@
275 <
275 > Doxygen                = @DOXYGEN@
276  
277   MakeOptions            = -k
278   MakeDependOptions      =
# Line 486 | Line 486 | $(PackageTargetDir)/%_Skel.class : $(PackageTargetDir)
486   %_Skel.class : %.class
487          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
488  
489 + document :
490 +        $(Print) Generate Documentation for OOPSE-2.0
491 +        @cd $(DEV_ROOT)/src    
492 +        $(Doxygen) $(DEV_ROOT)/make/Doxyfile
493 +
494   #GUN make funtions to merge the libraries
495   find_objs = $(shell $(StaticArchiver) -t $(1))
496   extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1)))
# Line 587 | Line 592 | ifneq "$(words $(CppFiles))" "0"
592  
593   ifneq "$(words $(CppFiles))" "0"
594          $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
595 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
595 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
596          $(Delete) Make.cpptemp
597          $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
598 <        cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
599 <        $(Delete) Make.cpptemp
598 >        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
599 >        @$(Delete) Make.cpptemp
600   endif
601  
602   ifneq "$(words $(CFiles))" "0"
603          $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
604 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
604 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
605          $(Delete) Make.ctemp
606          $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
607 <        cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
608 <        $(Delete) Make.ctemp
607 >        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
608 >        @$(Delete) Make.ctemp
609   endif
610  
611   ifneq "$(words $(F90Files))" "0"
612 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare)  $(F90Files) > Make.ftemp
613 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare)  $(F90Files) >> Make.ftemp
614 <        cat Make.ftemp >> $(DependencyFile)
615 <        $(Delete) Make.ftemp
612 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
613 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
614 >        @cat Make.ftemp >> $(DependencyFile)
615 >        @$(Delete) Make.ftemp
616   endif
617  
618   # make lib

Diff Legend

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