50 |
|
constraints \ |
51 |
|
minimizers \ |
52 |
|
selection \ |
53 |
< |
|
53 |
> |
restraints \ |
54 |
> |
lattice \ |
55 |
> |
hydrodynamics \ |
56 |
> |
openbabel\ |
57 |
> |
antlr\ |
58 |
> |
mdParser |
59 |
|
#packages containing applications |
60 |
|
Applications = \ |
61 |
|
applications/oopse \ |
62 |
|
applications/dump2Xyz \ |
58 |
– |
applications/simpleBuilder\ |
63 |
|
applications/staticProps \ |
64 |
|
applications/dynamicProps \ |
65 |
+ |
applications/simpleBuilder \ |
66 |
+ |
applications/randomBuilder \ |
67 |
+ |
applications/nanoRodBuilder \ |
68 |
+ |
applications/nanoparticleBuilder \ |
69 |
+ |
applications/atom2md \ |
70 |
+ |
applications/hydrodynamics \ |
71 |
+ |
applications/utilities |
72 |
|
|
73 |
+ |
|
74 |
|
Samples = \ |
75 |
+ |
samples/alkane \ |
76 |
|
samples/argon \ |
77 |
< |
samples/water/dimer \ |
77 |
> |
samples/cutoff \ |
78 |
> |
samples/dipole \ |
79 |
> |
samples/gbljtest \ |
80 |
> |
samples/lipid \ |
81 |
> |
samples/metals/EAM \ |
82 |
> |
samples/metals/EAM/nanoparticle \ |
83 |
> |
samples/metals/EAM/nanorod \ |
84 |
> |
samples/metals/Sutton-Chen \ |
85 |
> |
samples/minimizer \ |
86 |
> |
samples/thermoIntegration/liquid \ |
87 |
> |
samples/thermoIntegration/solid \ |
88 |
> |
samples/water/dimer \ |
89 |
|
samples/water/spce \ |
90 |
|
samples/water/ssd \ |
91 |
|
samples/water/ssde \ |
92 |
+ |
samples/water/ssdrf \ |
93 |
+ |
samples/water/ssd-ion \ |
94 |
|
samples/water/tip3p_ice \ |
95 |
|
samples/water/tip4p \ |
96 |
< |
samples/lipid \ |
71 |
< |
samples/alkane \ |
72 |
< |
samples/minimizer \ |
73 |
< |
samples/metals \ |
74 |
< |
samples/zcons \ |
96 |
> |
samples/zcons |
97 |
|
|
98 |
|
IncludeDirs = \ |
99 |
< |
@SPRNG_INC_DIR@ \ |
100 |
< |
@MPI_INC_DIR@ |
99 |
> |
@MPI_INC_DIR@ \ |
100 |
> |
@FFTW_INC_DIR@ \ |
101 |
> |
@CGAL_INC_DIR@ \ |
102 |
> |
@ZLIB_INC_DIR@ |
103 |
|
|
104 |
|
LibraryDirs = \ |
105 |
< |
@SPRNG_LIB_DIR@ \ |
106 |
< |
@MPI_LIB_DIR@ |
105 |
> |
@MPI_LIB_DIR@ \ |
106 |
> |
@FFTW_LIB_DIR@ \ |
107 |
> |
@CGAL_LIB_DIR@ \ |
108 |
> |
@ZLIB_LIB_DIR@ |
109 |
|
|
110 |
|
Libraries = \ |
111 |
< |
@SPRNG_LIB@ \ |
111 |
> |
@LIBS@ \ |
112 |
|
@MPI_LIB@ \ |
113 |
< |
@MPI_F90_LIB@ |
113 |
> |
@MPI_F90_LIB@ \ |
114 |
> |
@FFTW_LIBS@ \ |
115 |
> |
@CGAL_LIBS@ \ |
116 |
> |
@ZLIB@ |
117 |
|
|
118 |
|
OopseHome = @OOPSE_HOME@ |
119 |
|
ForceParamDir = $(OopseHome)/share/forceFields |
122 |
|
DocDir = $(OopseHome)/doc |
123 |
|
FrcDeclare = -DFRC_PATH="$(ForceParamDir)" |
124 |
|
F90Declare = -D__FORTRAN90 |
125 |
+ |
UseSingle = @USE_SINGLE_PRECISION@ |
126 |
+ |
ifeq "$(UseSingle)" "yes" |
127 |
+ |
SingleDeclare = -DSINGLE_PRECISION |
128 |
+ |
else |
129 |
+ |
SingleDeclare = |
130 |
+ |
endif |
131 |
|
ParallelDeclare = -DIS_MPI |
132 |
+ |
SinglePrecision = -DSINGLE_PRECISION |
133 |
|
UseMPI = @USE_MPI@ |
134 |
|
ModuleCase = @F90_MODULE_NAMES@ |
135 |
|
ModSuffix = @MOD@ |
136 |
|
LinkOptions = \ |
137 |
< |
@F90LIBS@ |
137 |
> |
@LDFLAGS@ \ |
138 |
> |
@FCLIBS@ \ |
139 |
> |
@CXXFLAGS@ |
140 |
> |
|
141 |
|
|
142 |
|
ParallelLinkOptions = \ |
143 |
< |
@F90LIBS@ |
143 |
> |
@LDFLAGS@ \ |
144 |
> |
@FCLIBS@ \ |
145 |
> |
@CXXFLAGS@ |
146 |
|
|
147 |
|
|
148 |
|
#--------------------------------------------------------------------------- |
156 |
|
ParallelTargetDir = $(DEV_ROOT)/MPIobj |
157 |
|
LibDir = $(DEV_ROOT)/lib |
158 |
|
MakeDir = $(DEV_ROOT)/make |
159 |
+ |
MainMakefile = $(MakeDir)/Makefile |
160 |
|
BinDir = $(DEV_ROOT)/bin |
161 |
|
DocsDir = $(DEV_ROOT)/docs |
162 |
|
CurrentDir = $(CURDIR) |
249 |
|
|
250 |
|
OtherTargetFiles = $(OtherSourceFiles:%=$(PackageTargetDir)/%) |
251 |
|
|
252 |
+ |
########################################################################### |
253 |
+ |
# |
254 |
+ |
# Figure out the names of the module files based on some work done by |
255 |
+ |
# configure. The tr function below is from John Graham-Cumming |
256 |
+ |
# (http://www.jgc.org). |
257 |
+ |
# |
258 |
+ |
# The tr function. Has three arguments: |
259 |
+ |
# |
260 |
+ |
# $1 The list of characters to translate from |
261 |
+ |
# $2 The list of characters to translate to |
262 |
+ |
# $3 The text to translate |
263 |
+ |
# |
264 |
+ |
# For example, $(call tr,A B C,1 2 3,CAPITAL) becomes 21PIT1L. |
265 |
+ |
|
266 |
+ |
tr = $(eval __t := $3) \ |
267 |
+ |
$(foreach c, \ |
268 |
+ |
$(join $(addsuffix :,$1),$2), \ |
269 |
+ |
$(eval __t := \ |
270 |
+ |
$(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \ |
271 |
+ |
$(__t))))$(__t) |
272 |
+ |
|
273 |
+ |
# Common character classes for use with the tr function. Each of |
274 |
+ |
# these is actually a variable declaration and must be wrapped with |
275 |
+ |
# $() or ${} to be used. |
276 |
+ |
|
277 |
+ |
[A-Z] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z # |
278 |
+ |
[a-z] := a b c d e f g h i j k l m n o p q r s t u v w x y z # |
279 |
+ |
[0-9] := 0 1 2 3 4 5 6 7 8 9 # |
280 |
+ |
[A-F] := A B C D E F # |
281 |
+ |
|
282 |
+ |
# Figure out whether we have $(eval) or not (GNU Make 3.80 and above) |
283 |
+ |
# if we do not then we need to use the shell version of tr, and not the |
284 |
+ |
# faster tr function above: |
285 |
+ |
|
286 |
+ |
__have_eval := $(false) |
287 |
+ |
__ignore := $(eval __have_eval := $(true)) |
288 |
+ |
|
289 |
+ |
ifndef __have_eval |
290 |
+ |
uc = $(shell echo $1 | tr "a-z" "A-Z") |
291 |
+ |
lc = $(shell echo $1 | tr "A-Z" "a-z") |
292 |
+ |
else |
293 |
+ |
uc = $(call tr,$([a-z]),$([A-Z]),$1) |
294 |
+ |
lc = $(call tr,$([A-Z]),$([a-z]),$1) |
295 |
+ |
endif |
296 |
+ |
|
297 |
+ |
# OK, now we can actually use these functions to figure out the names |
298 |
+ |
# of the module files: |
299 |
+ |
|
300 |
+ |
ifneq "$(words $(Modules))" "0" |
301 |
+ |
ifeq "$(ModuleCase)" "UPPER" |
302 |
+ |
MODULES = $(call uc,$(Modules)) |
303 |
+ |
else |
304 |
+ |
ifeq "$(ModuleCase)" "lower" |
305 |
+ |
MODULES = $(call lc,$(Modules)) |
306 |
+ |
else |
307 |
+ |
MODULES = $(Modules) |
308 |
+ |
endif |
309 |
+ |
endif |
310 |
+ |
ModuleFiles = $(MODULES:%= $(PackageTargetDir)/%.$(ModSuffix)) |
311 |
+ |
ParallelModuleFiles = $(MODULES:%= $(PackageParallelTargetDir)/%.$(ModSuffix)) |
312 |
+ |
endif |
313 |
+ |
# |
314 |
+ |
########################################################################### |
315 |
+ |
|
316 |
|
ThirdPartyJarsTmp = $(patsubst %,$(LibDir)/%,$(JavaLibraries)) |
317 |
|
ThirdPartyJars = $(subst $(Space),$(X),$(ThirdPartyJarsTmp)) |
318 |
|
|
324 |
|
#if Main is defined, do not build library. It may not be true sometimes |
325 |
|
ifneq "$(words $(ObjectFiles) $(ParallelObjectFiles))" "0" |
326 |
|
DependencyFile = $(PackageSourceDir)/Makedepend |
327 |
< |
ifneq "$(Main)" "" |
327 |
> |
ifneq "$(words $(Main))" "0" |
328 |
|
Executable = $(BinDir)/$(Main) |
329 |
< |
ParallelExecutable = $(BinDir)/$(Main)_MPI |
329 |
> |
ifeq "$(BuiltParallelExe)" "1" |
330 |
> |
ParallelExecutable = $(BinDir)/$(Main)_MPI |
331 |
> |
endif |
332 |
|
else |
333 |
|
SharedLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.so |
334 |
|
StaticLibrary = $(LibDir)/lib$(subst /,,$(patsubst %,oopse_%,$(Package)))_UP.a |
364 |
|
CppCompiler = @CXX@ |
365 |
|
Linker = @CXX@ |
366 |
|
MakeDepend = makedepend |
367 |
+ |
LN_S = @LN_S@ |
368 |
|
INSTALL = @INSTALL@ |
369 |
+ |
EGREP = @EGREP@ |
370 |
|
InstallProgram = @INSTALL_PROGRAM@ |
371 |
+ |
InstallScript = @INSTALL_SCRIPT@ |
372 |
|
InstallData = @INSTALL_DATA@ |
373 |
|
MkDir = @MKINSTALLDIRS@ |
374 |
< |
Delete = rm -fr |
374 |
> |
Delete = rm -f |
375 |
|
StaticArchiver = @AR@ |
376 |
|
DynamicArchiver = @CC@ |
377 |
|
FortranCompiler = @FC@ |
267 |
– |
F90Compiler = @F90@ |
378 |
|
JavaCompiler = $(JAVA_HOME)/bin/javac |
379 |
|
JavaArchiver = $(JAVA_HOME)/bin/jar |
380 |
|
JarSigner = $(JAVA_HOME)/bin/jarsigner |
398 |
|
JniOptions = |
399 |
|
RmiOptions = -d $(TargetDir) -classpath $(ClassPath) \ |
400 |
|
-sourcepath $(SourceDir) |
401 |
< |
COptions = $(FrcDeclare) @CFLAGS@ |
402 |
< |
CParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@ |
403 |
< |
CppOptions = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ |
404 |
< |
CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ |
405 |
< |
FortranOptions = |
406 |
< |
F90Options = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) |
407 |
< |
F90ParallelOptions = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) |
401 |
> |
COptions = $(FrcDeclare) $(SingleDeclare) @CFLAGS@ |
402 |
> |
CParallelOptions = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CFLAGS@ |
403 |
> |
CppOptions = $(FrcDeclare) $(SingleDeclare) @CXXFLAGS@ |
404 |
> |
CppParallelOptions = $(FrcDeclare) $(SingleDeclare) $(ParallelDeclare) @CXXFLAGS@ |
405 |
> |
ifeq "$(UseSingle)" "yes" |
406 |
> |
FortranOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @PREPDEFFLAG@$(SingleDeclare) @FCFLAGS_SRCEXT@ |
407 |
> |
FortranParallelOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(SingleDeclare) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@ |
408 |
> |
else |
409 |
> |
FortranOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) @FCFLAGS_SRCEXT@ |
410 |
> |
FortranParallelOptions = @FCFLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) @FCFLAGS_SRCEXT@ |
411 |
> |
endif |
412 |
|
JavaCompilerOptions = -d $(TargetDir) -classpath $(ClassPath) \ |
413 |
|
-sourcepath $(SourceDir) -deprecation |
414 |
|
JavaRunOptions = -classpath $(ClassPath) |
445 |
|
InstallCommand = $(InstallData) |
446 |
|
endif |
447 |
|
|
448 |
+ |
ifneq "$(words $(ScriptFiles))" "0" |
449 |
+ |
MyInstallDir = $(InstallBinDir) |
450 |
+ |
InstallFiles = $(ScriptFiles) |
451 |
+ |
InstallCommand = $(InstallProgram) |
452 |
+ |
endif |
453 |
+ |
|
454 |
|
ifneq "$(words $(Main))" "0" |
455 |
|
MyInstallDir = $(InstallBinDir) |
456 |
|
ifeq "$(UseMPI)" "yes" |
459 |
|
InstallFiles = $(Executable) |
460 |
|
endif |
461 |
|
InstallCommand = $(InstallProgram) |
462 |
+ |
ifneq "$(words $(LinkTargets))" "0" |
463 |
+ |
MyLinkSource = $(patsubst %, $(MyInstallDir)/%,$(Main)) |
464 |
+ |
MyLinkTargets = $(patsubst %, $(MyInstallDir)/%,$(LinkTargets)) |
465 |
+ |
endif |
466 |
|
endif |
467 |
|
|
468 |
|
ifneq "$(words $(ForcefieldFiles))" "0" |
499 |
|
$(MkDir) $@ |
500 |
|
|
501 |
|
# .c -> .o |
502 |
< |
$(PackageTargetDir)/%.o : %.c |
502 |
> |
$(PackageTargetDir)/%.o : %.c $(MainMakefile) |
503 |
|
$(Print) $@ |
504 |
|
$(CCompiler) $(COptions) -c $(IncludePath) $< -o $@ |
505 |
|
|
506 |
< |
$(PackageParallelTargetDir)/%.o : %.c |
506 |
> |
$(PackageParallelTargetDir)/%.o : %.c $(MainMakefile) |
507 |
|
$(Print) $@ |
508 |
|
$(CCompiler) $(CParallelOptions) -c $(IncludePath) $< -o $@ |
509 |
|
|
510 |
|
ifeq "$(UseMPI)" "yes" |
511 |
< |
%.o : %.c |
511 |
> |
%.o : %.c $(MainMakefile) |
512 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
513 |
|
$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ |
514 |
|
else |
515 |
< |
%.o : %.c |
515 |
> |
%.o : %.c $(MainMakefile) |
516 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
517 |
|
endif |
518 |
|
|
519 |
|
# .cpp -> .o |
520 |
< |
$(PackageTargetDir)/%.o : %.cpp |
520 |
> |
$(PackageTargetDir)/%.o : %.cpp $(MainMakefile) |
521 |
|
$(CppCompiler) $(CppOptions) -c $(IncludePath) $< -o $@ |
522 |
|
|
523 |
< |
$(PackageParallelTargetDir)/%.o : %.cpp |
523 |
> |
$(PackageParallelTargetDir)/%.o : %.cpp $(MainMakefile) |
524 |
|
$(CppCompiler) $(CppParallelOptions) -c $(IncludePath) $< -o $@ |
525 |
|
|
526 |
|
ifeq "$(UseMPI)" "yes" |
527 |
< |
%.o : %.cpp |
527 |
> |
%.o : %.cpp $(MainMakefile) |
528 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
529 |
|
$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ |
530 |
|
else |
531 |
< |
%.o : %.cpp |
531 |
> |
%.o : %.cpp $(MainMakefile) |
532 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
533 |
|
endif |
534 |
|
|
535 |
|
# .f -> .o |
536 |
< |
$(PackageTargetDir)/%.o : %.f |
536 |
> |
$(PackageTargetDir)/%.o : %.f $(MainMakefile) |
537 |
|
$(FortranCompiler) $(FortranOptions) -c $< -o $@ |
538 |
|
|
539 |
< |
$(PackageParallelTargetDir)/%.o : %.f |
539 |
> |
$(PackageParallelTargetDir)/%.o : %.f $(MainMakefile) |
540 |
|
$(FortranCompiler) $(FortranParallelOptions) -c $< -o $@ |
541 |
|
|
542 |
|
ifeq "$(UseMPI)" "yes" |
543 |
< |
%.o : %.f |
543 |
> |
%.o : %.f $(MainMakefile) |
544 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
545 |
|
$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ |
546 |
|
else |
547 |
< |
%.o : %.f |
547 |
> |
%.o : %.f $(MainMakefile) |
548 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
549 |
|
endif |
550 |
|
|
551 |
|
# .F90 -> .o |
552 |
< |
$(PackageTargetDir)/%.o : %.F90 |
553 |
< |
$(F90Compiler) $(F90Options) $(IncludePath) -c $< -o $@ |
552 |
> |
$(PackageTargetDir)/%.o : %.F90 $(MainMakefile) |
553 |
> |
$(FortranCompiler) $(FortranOptions) $(IncludePath) -c $< -o $@ |
554 |
|
if test -n "`ls *.$(ModSuffix)`"; then \ |
555 |
|
$(Move) `ls *.$(ModSuffix)` $(PackageTargetDir);\ |
556 |
|
fi |
557 |
|
|
558 |
< |
$(PackageParallelTargetDir)/%.o : %.F90 |
559 |
< |
$(F90Compiler) $(F90ParallelOptions) $(IncludePath) -c $< -o $@ |
558 |
> |
$(PackageParallelTargetDir)/%.o : %.F90 $(MainMakefile) |
559 |
> |
$(FortranCompiler) $(FortranParallelOptions) $(IncludePath) -c $< -o $@ |
560 |
|
if test -n "`ls *.$(ModSuffix)`"; then \ |
561 |
|
$(Move) "`ls *.$(ModSuffix)`" $(PackageParallelTargetDir);\ |
562 |
|
fi |
563 |
|
|
564 |
|
ifeq "$(UseMPI)" "yes" |
565 |
< |
%.o : %.F90 |
565 |
> |
%.o : %.F90 $(MainMakefile) |
566 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
567 |
|
if test -n "`ls *.$(ModSuffix)`"; then\ |
568 |
|
$(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ |
574 |
|
fi |
575 |
|
|
576 |
|
else |
577 |
< |
%.o : %.F90 |
577 |
> |
%.o : %.F90 $(MainMakefile) |
578 |
|
$(MAKE) $(MakeOptions) $(PackageTargetDir)/$@ |
579 |
|
if test -n "`ls *.$(ModSuffix)`"; then\ |
580 |
|
$(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ |
681 |
|
$(Doxygen) $(DEV_ROOT)/make/Doxyfile |
682 |
|
|
683 |
|
#GUN make funtions to merge the libraries |
684 |
< |
find_objs = $(shell $(StaticArchiver) -t $(1)) |
684 |
> |
find_objs = $(shell $(StaticArchiver) -t $(1) | $(EGREP) -v "SYMDEF") |
685 |
|
extract_objs = $(shell $(StaticArchiver) -x $(1) $(call find_objs, $(1))) |
686 |
|
create_archive = $(shell $(StaticArchiver) $(StaticArchiverOptions) $(2) $(call find_objs, $(1))) |
687 |
|
remove_objs = $(shell $(Delete) $(call find_objs, $(1))) |
688 |
|
do_create = $(call extract_objs,$(1))$(call create_archive,$(1),$(2))$(call remove_objs,$(1)) |
689 |
+ |
do_link = $(shell $(LN_S) $(1) $(2)) |
690 |
+ |
all_objs = $(foreach thisLib,$(LibNames), $(call find_objs, $(thisLib))) |
691 |
+ |
all_parallel_objs = $(foreach thisLib,$(ParallelLibNames), $(call find_objs, $(thisLib))) |
692 |
+ |
all_lib_objs = $(patsubst %,$(TargetDir)/%,$(call all_objs)) |
693 |
+ |
all_lib_parallel_objs = $(patsubst %,$(ParallelTargetDir)/%,$(call all_parallel_objs)) |
694 |
|
|
695 |
|
$(CombinedStaticLib) : $(LibDir)/.stamp_UP |
696 |
< |
$(Print) create $@ |
697 |
< |
$(foreach thisLib,$(LibNames),$(call do_create,$(thisLib),$@)) |
696 |
> |
$(Print) creating $@ |
697 |
> |
$(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_objs) |
698 |
|
$(Ranlib) $(CombinedStaticLib) |
699 |
|
|
700 |
|
$(CombinedParallelStaticLib) : $(LibDir)/.stamp_MPI |
701 |
< |
$(Print) create $@ |
702 |
< |
$(foreach thisLib,$(ParallelLibNames), $(call do_create, $(thisLib), $@)) |
701 |
> |
$(Print) creating $@ |
702 |
> |
$(StaticArchiver) $(StaticArchiverOptions) $@ $(call all_lib_parallel_objs) |
703 |
|
$(Ranlib) $(CombinedParallelStaticLib) |
704 |
|
|
705 |
|
# Executable |
706 |
< |
$(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir) |
706 |
> |
$(Executable) : $(CombinedStaticLib) $(ObjectFiles) |
707 |
> |
if test ! -d $(BinDir); then \ |
708 |
> |
$(MkDir) $(BinDir) ;\ |
709 |
> |
fi |
710 |
|
$(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@ |
711 |
|
|
712 |
< |
$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir) |
712 |
> |
$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) |
713 |
> |
if test ! -d $(BinDir); then \ |
714 |
> |
$(MkDir) $(BinDir) ;\ |
715 |
> |
fi |
716 |
|
$(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@ |
717 |
|
|
718 |
|
# Anything else is just copied from source to target |
756 |
|
$(Executable) |
757 |
|
endif |
758 |
|
|
759 |
+ |
echo : $(PackageListLoop) |
760 |
+ |
$(Print) Done echo. |
761 |
|
|
762 |
+ |
_echoall : |
763 |
+ |
$(Print) $(Modules) |
764 |
+ |
|
765 |
|
# make clean |
766 |
|
clean : $(PackageListLoop) |
767 |
|
$(Print) Done clean. |
768 |
|
|
769 |
|
_cleanall : |
770 |
< |
$(Delete) $(ObjectFiles) $(ParallelObjectFiles) |
770 |
> |
$(Delete) \ |
771 |
> |
$(ObjectFiles) \ |
772 |
> |
$(ModuleFiles) \ |
773 |
> |
$(ParallelObjectFiles) \ |
774 |
> |
$(ParallelModuleFiles) \ |
775 |
> |
$(JarFile) \ |
776 |
> |
$(SharedLibrary) \ |
777 |
> |
$(StaticLibrary) \ |
778 |
> |
$(ParallelSharedLibrary) \ |
779 |
> |
$(ParallelStaticLibrary) \ |
780 |
> |
$(CombinedStaticLib) \ |
781 |
> |
$(CombinedParallelStaticLib) |
782 |
|
|
783 |
|
# make distclean |
784 |
|
distclean : $(PackageListLoop) |
785 |
|
$(Print) Done clean. |
786 |
|
|
787 |
< |
_distcleanall : |
788 |
< |
$(Delete) $(ObjectFiles) \ |
638 |
< |
$(ParallelObjectFiles) \ |
639 |
< |
$(JarFile) \ |
640 |
< |
$(SharedLibrary) \ |
641 |
< |
$(StaticLibrary) \ |
642 |
< |
$(ParallelSharedLibrary) \ |
643 |
< |
$(ParallelStaticLibrary) \ |
644 |
< |
$(Executable) \ |
787 |
> |
_distcleanall : _cleanall |
788 |
> |
$(Delete) $(Executable) \ |
789 |
|
$(ParallelExecutable) \ |
790 |
|
$(DependencyFile) |
791 |
|
|
648 |
– |
|
792 |
|
# make depend |
793 |
|
depend : $(PackageListLoop) |
794 |
|
$(Print) Done dependencies. |
856 |
|
install : $(InstallListLoop) |
857 |
|
$(Print) Done Install |
858 |
|
|
859 |
< |
_installall : _buildall _installdata |
859 |
> |
_installall : _buildall _installdata _installlinks |
860 |
|
|
861 |
|
$(MyInstallDir) : |
862 |
|
$(MkDir) $@ |
864 |
|
_installdata : $(MyInstallDir) |
865 |
|
$(Print) $(InstallFiles) |
866 |
|
ifneq "$(words $(InstallFiles))" "0" |
867 |
< |
$(InstallData) $(InstallFiles) $(MyInstallDir) |
867 |
> |
$(InstallCommand) $(InstallFiles) $(MyInstallDir) |
868 |
|
endif |
869 |
|
|
870 |
+ |
_installlinks : $(MyInstallDir) |
871 |
+ |
ifneq "$(words $(MyLinkTargets))" "0" |
872 |
+ |
@cd $(MyInstallDir) |
873 |
+ |
$(foreach thisLink,$(MyLinkTargets),$(call do_link,$(MyLinkSource),$(thisLink))) |
874 |
+ |
endif |
875 |
+ |
|
876 |
|
# make statistics |
877 |
|
_statisticsall : |
878 |
|
@$(Print) $(patsubst %,$(CurrentDir)/%,$(SourceFiles)) >> $(DEV_ROOT)/files.tmp |
883 |
|
$(Print) Done statistics. |
884 |
|
|
885 |
|
# make pure |
886 |
< |
$(Executable).pure : |
887 |
< |
$(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \ |
888 |
< |
$(LibList) $(ObjectFiles) -o $@ |
886 |
> |
#$(Executable).pure : |
887 |
> |
# $(Purify) $(PurifyOptions) $(CppCompiler) $(LinkOptions) $(LibDirs) \ |
888 |
> |
# $(LibList) $(ObjectFiles) -o $@ |
889 |
> |
# |
890 |
> |
#pure : $(Executable).pure |
891 |
|
|
741 |
– |
pure : $(Executable).pure |
742 |
– |
|
892 |
|
#make cvslog |
893 |
|
cvslog: |
894 |
< |
$(DEV_ROOT)/scripts/cvs2cl.pl |
894 |
> |
$(DEV_ROOT)/scripts/cvs2cl |
895 |
|
|
896 |
|
# Execute |
897 |
|
_runexe : |