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

Comparing:
trunk/OOPSE-3.0/make/Makefile.in (file contents), Revision 1554 by tim, Mon Oct 11 18:40:22 2004 UTC vs.
branches/new_design/OOPSE-3.0/make/Makefile.in (file contents), Revision 1914 by tim, Tue Jan 11 15:46:22 2005 UTC

# Line 38 | Line 38 | PackageLibs = \
38   #packages containing libraries
39   PackageLibs = \
40          utils \
41 +        visitors \
42          math \
43          types \
44          primitives \
44 –        visitors \
45          UseTheForce/DarkSide \
46          UseTheForce \
47          brains \
48          io \
49 <        integrators \
50 <        minimizers \
51 <        constraints \
52 <        profiling \
53 <        restraints \
49 >        integrators\
50  
51   #packages containing applications
52   Applications = \
# Line 247 | Line 243 | Move                   = mv
243   #
244   #---------------------------------------------------------------------------
245   Print                  = @echo
246 < Move                   = mv
246 > Move                   = mv -f
247   Copy                   = cp
248   CCompiler              = @CC@
249   CppCompiler            = @CXX@
# Line 285 | Line 281 | COptions               = $(FrcDeclare)
281   JniOptions             =
282   RmiOptions             = -d $(TargetDir) -classpath $(ClassPath) \
283                           -sourcepath $(SourceDir)
284 < COptions               = $(FrcDeclare)
285 < CParallelOptions       = $(FrcDeclare) $(ParallelDeclare)
286 < CppOptions             = $(FrcDeclare)
287 < CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare)
284 > COptions               = $(FrcDeclare) @CFLAGS@
285 > CParallelOptions       = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@
286 > CppOptions             = $(FrcDeclare) @CXXFLAGS@
287 > CppParallelOptions     = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@
288   FortranOptions         =
289   F90Options             =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir)
290   F90ParallelOptions     =  @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir)  @PREPDEFFLAG@$(ParallelDeclare)
# Line 421 | Line 417 | $(PackageTargetDir)/%.o : %.F90
417   # .F90 -> .o
418   $(PackageTargetDir)/%.o : %.F90
419          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
420 <        if test -f *.$(ModSuffix); then \
421 <          $(Move) *.$(ModSuffix) $(PackageTargetDir);\
420 >        if test -n "`ls *.$(ModSuffix)`"; then \
421 >          $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
422          fi
423  
424   $(PackageParallelTargetDir)/%.o : %.F90
425          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
426 <        if test -f *.$(ModSuffix); then \
427 <          $(Move) *.$(ModSuffix) $(PackageParallelTargetDir);\
426 >        if test -n "`ls *.$(ModSuffix)`"; then \
427 >          $(Move) "`ls *.$(ModSuffix)`" (PackageParallelTargetDir);\
428          fi
429  
430   ifeq "$(UseMPI)" "yes"
# Line 652 | Line 648 | ifneq "$(words $(CppFiles))" "0"
648          @cd $(PackageSourceDir)
649  
650   ifneq "$(words $(CppFiles))" "0"
651 <        $(CppCompiler) $(CppOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
652 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
651 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' -MM $(CppFiles)>> Make.cpptemp
652 >        @cat Make.cpptemp  >> $(DependencyFile)
653          $(Delete) Make.cpptemp
654  
655    ifeq "$(UseMPI)" "yes"
656 <        $(CppCompiler) $(CppParallelOptions) $(IncludePath) -MM $(CppFiles) > Make.cpptemp
657 <        @cat Make.cpptemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
656 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CppFiles)>> Make.cpptemp
657 >        @cat Make.cpptemp  >> $(DependencyFile)
658          @$(Delete) Make.cpptemp
659    endif
660  
661   endif
662  
663   ifneq "$(words $(CFiles))" "0"
664 <        $(CCompiler) $(COptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
665 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(TargetDir\)\/&/g' >> $(DependencyFile)
664 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/'  -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
665 >        @cat Make.ctemp  >> $(DependencyFile)
666          $(Delete) Make.ctemp
667  
668    ifeq "$(UseMPI)" "yes"
669 <        $(CCompiler) $(CParallelOptions) $(IncludePath) -MM $(CFiles) $(DerivedCFiles) > Make.ctemp
670 <        @cat Make.ctemp | sed 's/^[a-zA-Z0-9]/$$\(ParallelTargetDir\)\/&/g' >> $(DependencyFile)
669 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) -MM $(CFiles) $(DerivedCFiles)  >> Make.ctemp
670 >        @cat Make.ctemp  >> $(DependencyFile)
671          @$(Delete) Make.ctemp
672    endif
673  
674   endif
675  
676   ifneq "$(words $(F90Files))" "0"
677 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
677 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(TargetDir)/' $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix) $(F90Files) > Make.ftemp
678          @cat Make.ftemp >> $(DependencyFile)
679          @$(Delete) Make.ftemp
680  
681    ifeq "$(UseMPI)" "yes"
682 <        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
682 >        $(DEV_ROOT)/scripts/filepp  -I $(DEV_ROOT)/src -od '$$(ParallelTargetDir)/' $(ParallelDeclare) $(F90Declare) -MM -mc $(ModuleCase) -ms $(ModSuffix)  $(F90Files) >> Make.ftemp
683          @cat Make.ftemp >> $(DependencyFile)
684          @$(Delete) Make.ftemp
685    endif

Diff Legend

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