ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/make/Makefile.in
(Generate patch)

Comparing trunk/make/Makefile.in (file contents):
Revision 1379 by gezelter, Thu Oct 22 14:09:13 2009 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC

# Line 58 | Line 58 | Applications = \
58  
59   #packages containing applications
60   Applications = \
61 <        applications/oopse \
61 >        applications/openmd \
62          applications/dump2Xyz \
63          applications/staticProps \
64          applications/dynamicProps \
# Line 116 | Line 116 | Libraries = \
116          @OPENBABEL_LIB@ \
117          @ZLIB@
118  
119 < OopseHome       = @OOPSE_HOME@
120 < ForceParamDir   = $(OopseHome)/forceFields
121 < SampleSimDir    = $(OopseHome)/samples
122 < InstallBinDir   = $(OopseHome)/bin
123 < DocDir          = $(OopseHome)/doc
119 > OpenMDHome       = @OPENMD_HOME@
120 > ForceParamDir   = $(OpenMDHome)/forceFields
121 > SampleSimDir    = $(OpenMDHome)/samples
122 > InstallBinDir   = $(OpenMDHome)/bin
123 > DocDir          = $(OpenMDHome)/doc
124   FrcDeclare      = -DFRC_PATH="$(ForceParamDir)"
125   F90Declare      = -D__FORTRAN90
126   UseSingle       = @USE_SINGLE_PRECISION@
# Line 161 | Line 161 | CurrentDir        = $(CURDIR)
161   BinDir            = $(DEV_ROOT)/bin
162   DocsDir           = $(DEV_ROOT)/docs
163   CurrentDir        = $(CURDIR)
164 < CombinedStaticLib = $(LibDir)/libOOPSE.a
165 < CombinedParallelStaticLib = $(LibDir)/libOOPSE_MPI.a
164 > CombinedStaticLib = $(LibDir)/libopenmd.a
165 > CombinedParallelStaticLib = $(LibDir)/libopenmd_MPI.a
166  
167   ifdef Source
168   #get the relative path of current package to source directory
# Line 331 | Line 331 | ifneq  "$(words $(ObjectFiles) $(ParallelObjectFiles))
331        ParallelExecutable     = $(BinDir)/$(Main)_MPI
332      endif
333    else
334 <    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so
335 <    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a
336 <    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.so
337 <    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_MPI.a
334 >    SharedLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,openmd_%,$(Package)))_UP.so
335 >    StaticLibrary          = $(LibDir)/lib$(subst /,,$(patsubst %,openmd_%,$(Package)))_UP.a
336 >    ParallelSharedLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,openmd_%,$(Package)))_MPI.so
337 >    ParallelStaticLibrary  = $(LibDir)/lib$(subst /,,$(patsubst %,openmd_%,$(Package)))_MPI.a
338    endif
339   endif
340  
# Line 345 | Line 345 | LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
345   JavaPackageNames = $(subst /,.,$(JavaPackages))
346   IncludePath      = -I$(SourceDir) $(IncludeDirs:%=-I%)
347   LibDirs          = -L$(LibDir)    $(LibraryDirs:%=-L%)
348 < LocalLibs        = $(subst /,,$(patsubst %, oopse_%_UP, $(PackageLibs)))
349 < ParallelLocalLibs= $(subst /,,$(patsubst %, oopse_%_MPI, $(PackageLibs)))
348 > LocalLibs        = $(subst /,,$(patsubst %, openmd_%_UP, $(PackageLibs)))
349 > ParallelLocalLibs= $(subst /,,$(patsubst %, openmd_%_MPI, $(PackageLibs)))
350   LibList          = $(LocalLibs:%=-l%) $(Libraries)
351   LibNames         = $(LocalLibs:%=$(LibDir)/lib%.a)
352   ParallelLibList  = $(ParallelLocalLibs:%=-l%) $(Libraries)
# Line 459 | Line 459 | ifneq "$(words $(RootFiles))" "0"
459   endif
460  
461   ifneq "$(words $(RootFiles))" "0"
462 <  MyInstallDir             = $(OopseHome)
462 >  MyInstallDir             = $(OpenMDHome)
463    InstallFiles             = $(RootFiles)
464    InstallCommand           = $(InstallData)
465   endif
# Line 689 | Line 689 | document :
689          $(MAKE) $(MakeOptions) $(PackageTargetDir)/$@
690  
691   document :
692 <        $(Print) Generate Documentation for OOPSE-2.0
692 >        $(Print) Generate Documentation for OpenMD
693          @cd $(DEV_ROOT)/src    
694          $(Doxygen) $(DEV_ROOT)/make/Doxyfile
695  

Diff Legend

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