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

Comparing trunk/OOPSE-3.0/make/Makefile.in (file contents):
Revision 2199 by gezelter, Thu Apr 14 21:41:56 2005 UTC vs.
Revision 2316 by gezelter, Tue Sep 20 22:13:44 2005 UTC

# Line 64 | Line 64 | Samples = \
64  
65   Samples = \
66          samples/argon \
67 <        samples/water/dimer \
67 >        samples/water/dimer \
68          samples/water/spce \
69          samples/water/ssd \
70          samples/water/ssde \
71 +        samples/water/ssdrf \
72 +        samples/water/ssd-ion \
73          samples/water/tip3p_ice \
74          samples/water/tip4p \
75          samples/lipid \
76          samples/alkane \
77          samples/minimizer \
78          samples/metals \
79 +        samples/thermoIntegration/liquid \
80 +        samples/thermoIntegration/solid \
81 +        samples/dipole \
82 +        samples/shape \
83          samples/zcons \
84  
85   IncludeDirs = \
# Line 85 | Line 91 | Libraries = \
91          @MPI_LIB_DIR@
92  
93   Libraries = \
94 +        @LIBS@ \
95          @CGAL_LIBS@ \
96          @MPI_LIB@ \
97          @MPI_F90_LIB@
# Line 118 | Line 125 | BinDir            = $(DEV_ROOT)/bin
125   ParallelTargetDir = $(DEV_ROOT)/MPIobj
126   LibDir            = $(DEV_ROOT)/lib
127   MakeDir           = $(DEV_ROOT)/make
128 + MainMakefile      = $(MakeDir)/Makefile
129   BinDir            = $(DEV_ROOT)/bin
130   DocsDir           = $(DEV_ROOT)/docs
131   CurrentDir        = $(CURDIR)
# Line 330 | Line 338 | Delete                 = rm -fr
338   InstallScript          = @INSTALL_SCRIPT@
339   InstallData            = @INSTALL_DATA@
340   MkDir                  = @MKINSTALLDIRS@
341 < Delete                 = rm -fr
341 > Delete                 = rm -f
342   StaticArchiver         = @AR@
343   DynamicArchiver        = @CC@
344   FortranCompiler        = @FC@
# Line 445 | Line 453 | $(PackageTargetDir)/%.o : %.c
453          $(MkDir) $@
454  
455   # .c -> .o
456 < $(PackageTargetDir)/%.o : %.c
456 > $(PackageTargetDir)/%.o : %.c $(MainMakefile)
457          $(Print) $@
458          $(CCompiler) $(COptions) -c $(IncludePath) $< -o $@
459  
460 < $(PackageParallelTargetDir)/%.o : %.c
460 > $(PackageParallelTargetDir)/%.o : %.c $(MainMakefile)
461          $(Print) $@
462          $(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@
463  
464   ifeq "$(UseMPI)" "yes"
465 < %.o : %.c
465 > %.o : %.c $(MainMakefile)
466          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
467          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
468   else
469 < %.o : %.c
469 > %.o : %.c $(MainMakefile)
470          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
471   endif
472  
473   # .cpp -> .o
474 < $(PackageTargetDir)/%.o : %.cpp
474 > $(PackageTargetDir)/%.o : %.cpp $(MainMakefile)
475          $(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@
476  
477 < $(PackageParallelTargetDir)/%.o : %.cpp
477 > $(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile)
478          $(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@
479  
480   ifeq "$(UseMPI)" "yes"
481 < %.o : %.cpp
481 > %.o : %.cpp $(MainMakefile)
482          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
483          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
484   else
485 < %.o : %.cpp
485 > %.o : %.cpp $(MainMakefile)
486          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
487   endif
488  
489   # .f -> .o
490 < $(PackageTargetDir)/%.o : %.f
490 > $(PackageTargetDir)/%.o : %.f $(MainMakefile)
491          $(FortranCompiler) $(FortranOptions) -c $< -o $@
492  
493 < $(PackageParallelTargetDir)/%.o : %.f
493 > $(PackageParallelTargetDir)/%.o : %.f $(MainMakefile)
494          $(FortranCompiler) $(FortranParallelOptions) -c $< -o $@
495  
496   ifeq "$(UseMPI)" "yes"
497 < %.o : %.f
497 > %.o : %.f $(MainMakefile)
498          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
499          $(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@
500   else
501 < %.o : %.f
501 > %.o : %.f $(MainMakefile)
502          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
503   endif
504  
505   # .F90 -> .o
506 < $(PackageTargetDir)/%.o : %.F90
506 > $(PackageTargetDir)/%.o : %.F90 $(MainMakefile)
507          $(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@
508          if test -n "`ls *.$(ModSuffix)`"; then \
509            $(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\
510          fi
511  
512 < $(PackageParallelTargetDir)/%.o : %.F90
512 > $(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile)
513          $(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@
514          if test -n "`ls *.$(ModSuffix)`"; then \
515            $(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\
516          fi
517  
518   ifeq "$(UseMPI)" "yes"
519 < %.o : %.F90
519 > %.o : %.F90 $(MainMakefile)
520          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
521          if test -n "`ls *.$(ModSuffix)`"; then\
522            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\
# Line 520 | Line 528 | else
528          fi
529  
530   else
531 < %.o : %.F90
531 > %.o : %.F90 $(MainMakefile)
532          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
533          if test -n "`ls *.$(ModSuffix)`"; then\
534            $(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines