51 |
|
minimizers \ |
52 |
|
selection \ |
53 |
|
restraints \ |
54 |
+ |
lattice \ |
55 |
|
|
56 |
|
#packages containing applications |
57 |
|
Applications = \ |
58 |
|
applications/oopse \ |
59 |
|
applications/dump2Xyz \ |
59 |
– |
applications/simpleBuilder\ |
60 |
|
applications/staticProps \ |
61 |
|
applications/dynamicProps \ |
62 |
+ |
applications/simpleBuilder\ |
63 |
+ |
applications/nanoRodBuilder \ |
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 = \ |
86 |
< |
@MPI_INC_DIR@ |
86 |
> |
@CGAL_INC_DIR@ \ |
87 |
> |
@MPI_INC_DIR@ |
88 |
|
|
89 |
|
LibraryDirs = \ |
90 |
+ |
@CGAL_LIB_DIR@ \ |
91 |
|
@MPI_LIB_DIR@ |
92 |
|
|
93 |
|
Libraries = \ |
94 |
+ |
@CGAL_LIBS@ \ |
95 |
|
@MPI_LIB@ \ |
96 |
< |
@MPI_F90_LIB@ |
96 |
> |
@MPI_F90_LIB@ |
97 |
|
|
98 |
|
OopseHome = @OOPSE_HOME@ |
99 |
|
ForceParamDir = $(OopseHome)/share/forceFields |
124 |
|
ParallelTargetDir = $(DEV_ROOT)/MPIobj |
125 |
|
LibDir = $(DEV_ROOT)/lib |
126 |
|
MakeDir = $(DEV_ROOT)/make |
127 |
+ |
MainMakefile = $(MakeDir)/Makefile |
128 |
|
BinDir = $(DEV_ROOT)/bin |
129 |
|
DocsDir = $(DEV_ROOT)/docs |
130 |
|
CurrentDir = $(CURDIR) |
247 |
|
[0-9] := 0 1 2 3 4 5 6 7 8 9 # |
248 |
|
[A-F] := A B C D E F # |
249 |
|
|
250 |
< |
# Upper case and lower case functions. Each function has a single |
251 |
< |
# argument which is the text to alter |
250 |
> |
# Figure out whether we have $(eval) or not (GNU Make 3.80 and above) |
251 |
> |
# if we do not then we need to use the shell version of tr, and not the |
252 |
> |
# faster tr function above: |
253 |
|
|
254 |
< |
uc = $(call tr,$([a-z]),$([A-Z]),$1) |
255 |
< |
lc = $(call tr,$([A-Z]),$([a-z]),$1) |
254 |
> |
__have_eval := $(false) |
255 |
> |
__ignore := $(eval __have_eval := $(true)) |
256 |
|
|
257 |
+ |
ifndef __have_eval |
258 |
+ |
uc = $(shell echo $1 | tr "a-z" "A-Z") |
259 |
+ |
lc = $(shell echo $1 | tr "A-Z" "a-z") |
260 |
+ |
else |
261 |
+ |
uc = $(call tr,$([a-z]),$([A-Z]),$1) |
262 |
+ |
lc = $(call tr,$([A-Z]),$([a-z]),$1) |
263 |
+ |
endif |
264 |
+ |
|
265 |
|
# OK, now we can actually use these functions to figure out the names |
266 |
|
# of the module files: |
267 |
|
|
337 |
|
InstallScript = @INSTALL_SCRIPT@ |
338 |
|
InstallData = @INSTALL_DATA@ |
339 |
|
MkDir = @MKINSTALLDIRS@ |
340 |
< |
Delete = rm -fr |
340 |
> |
Delete = rm -f |
341 |
|
StaticArchiver = @AR@ |
342 |
|
DynamicArchiver = @CC@ |
343 |
|
FortranCompiler = @FC@ |
452 |
|
$(MkDir) $@ |
453 |
|
|
454 |
|
# .c -> .o |
455 |
< |
$(PackageTargetDir)/%.o : %.c |
455 |
> |
$(PackageTargetDir)/%.o : %.c $(MainMakefile) |
456 |
|
$(Print) $@ |
457 |
|
$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ |
458 |
|
|
459 |
< |
$(PackageParallelTargetDir)/%.o : %.c |
459 |
> |
$(PackageParallelTargetDir)/%.o : %.c $(MainMakefile) |
460 |
|
$(Print) $@ |
461 |
|
$(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@ |
462 |
|
|
463 |
|
ifeq "$(UseMPI)" "yes" |
464 |
< |
%.o : %.c |
464 |
> |
%.o : %.c $(MainMakefile) |
465 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
466 |
|
$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ |
467 |
|
else |
468 |
< |
%.o : %.c |
468 |
> |
%.o : %.c $(MainMakefile) |
469 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
470 |
|
endif |
471 |
|
|
472 |
|
# .cpp -> .o |
473 |
< |
$(PackageTargetDir)/%.o : %.cpp |
473 |
> |
$(PackageTargetDir)/%.o : %.cpp $(MainMakefile) |
474 |
|
$(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ |
475 |
|
|
476 |
< |
$(PackageParallelTargetDir)/%.o : %.cpp |
476 |
> |
$(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile) |
477 |
|
$(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@ |
478 |
|
|
479 |
|
ifeq "$(UseMPI)" "yes" |
480 |
< |
%.o : %.cpp |
480 |
> |
%.o : %.cpp $(MainMakefile) |
481 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
482 |
|
$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ |
483 |
|
else |
484 |
< |
%.o : %.cpp |
484 |
> |
%.o : %.cpp $(MainMakefile) |
485 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
486 |
|
endif |
487 |
|
|
488 |
|
# .f -> .o |
489 |
< |
$(PackageTargetDir)/%.o : %.f |
489 |
> |
$(PackageTargetDir)/%.o : %.f $(MainMakefile) |
490 |
|
$(FortranCompiler) $(FortranOptions) -c $< -o $@ |
491 |
|
|
492 |
< |
$(PackageParallelTargetDir)/%.o : %.f |
492 |
> |
$(PackageParallelTargetDir)/%.o : %.f $(MainMakefile) |
493 |
|
$(FortranCompiler) $(FortranParallelOptions) -c $< -o $@ |
494 |
|
|
495 |
|
ifeq "$(UseMPI)" "yes" |
496 |
< |
%.o : %.f |
496 |
> |
%.o : %.f $(MainMakefile) |
497 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
498 |
|
$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ |
499 |
|
else |
500 |
< |
%.o : %.f |
500 |
> |
%.o : %.f $(MainMakefile) |
501 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
502 |
|
endif |
503 |
|
|
504 |
|
# .F90 -> .o |
505 |
< |
$(PackageTargetDir)/%.o : %.F90 |
505 |
> |
$(PackageTargetDir)/%.o : %.F90 $(MainMakefile) |
506 |
|
$(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@ |
507 |
|
if test -n "`ls *.$(ModSuffix)`"; then \ |
508 |
|
$(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\ |
509 |
|
fi |
510 |
|
|
511 |
< |
$(PackageParallelTargetDir)/%.o : %.F90 |
511 |
> |
$(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile) |
512 |
|
$(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@ |
513 |
|
if test -n "`ls *.$(ModSuffix)`"; then \ |
514 |
|
$(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\ |
515 |
|
fi |
516 |
|
|
517 |
|
ifeq "$(UseMPI)" "yes" |
518 |
< |
%.o : %.F90 |
518 |
> |
%.o : %.F90 $(MainMakefile) |
519 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
520 |
|
if test -n "`ls *.$(ModSuffix)`"; then\ |
521 |
|
$(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ |
527 |
|
fi |
528 |
|
|
529 |
|
else |
530 |
< |
%.o : %.F90 |
530 |
> |
%.o : %.F90 $(MainMakefile) |
531 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
532 |
|
if test -n "`ls *.$(ModSuffix)`"; then\ |
533 |
|
$(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ |
827 |
|
|
828 |
|
#make cvslog |
829 |
|
cvslog: |
830 |
< |
$(DEV_ROOT)/scripts/cvs2cl.pl |
830 |
> |
$(DEV_ROOT)/scripts/cvs2cl |
831 |
|
|
832 |
|
# Execute |
833 |
|
_runexe : |