--- trunk/OOPSE-2.0/make/Makefile.in 2005/04/11 19:06:57 2158 +++ trunk/OOPSE-2.0/make/Makefile.in 2005/04/13 22:30:22 2190 @@ -51,14 +51,16 @@ PackageLibs = \ minimizers \ selection \ restraints \ + lattice \ #packages containing applications Applications = \ applications/oopse \ applications/dump2Xyz \ - applications/simpleBuilder\ applications/staticProps \ applications/dynamicProps \ + applications/simpleBuilder\ + applications/nanoRodBuilder \ Samples = \ samples/argon \ @@ -75,14 +77,17 @@ IncludeDirs = \ samples/zcons \ IncludeDirs = \ - @MPI_INC_DIR@ + @CGAL_INC_DIR@ \ + @MPI_INC_DIR@ LibraryDirs = \ + @CGAL_LIB_DIR@ \ @MPI_LIB_DIR@ Libraries = \ + @CGAL_LIBS@ \ @MPI_LIB@ \ - @MPI_F90_LIB@ + @MPI_F90_LIB@ OopseHome = @OOPSE_HOME@ ForceParamDir = $(OopseHome)/share/forceFields @@ -243,7 +248,7 @@ ifndef __have_eval __ignore := $(eval __have_eval := $(true)) ifndef __have_eval - uc = $(shell echo $1 | tr "A-Z" "a-z") + uc = $(shell echo $1 | tr "a-z" "A-Z") lc = $(shell echo $1 | tr "A-Z" "a-z") else uc = $(call tr,$([a-z]),$([A-Z]),$1)