123 |
|
# /home/maul/gezelter/src/code/src/UseTheForce/Darkside --> UseTheForce/Darkside |
124 |
|
#Package = $(shell echo $(CurrentDir) | sed -e 's/^.*\/src\/\(.*\)/\1/g') |
125 |
|
#use shell script to get the absolute path and then rip it off from $(CurrentDir) |
126 |
< |
Package = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir)) |
126 |
> |
#Package = $(subst $(shell cd $(SourceDir); pwd)/,,$(CurrentDir)) |
127 |
> |
# REMINDER: We are now using the Package line in each subdir makefile. |
128 |
> |
# This avoids the strange path problem and the subshell |
129 |
|
|
130 |
|
PackageList = $(Package) |
131 |
|
PackageSourceDir = $(SourceDir)/$(Package) |
256 |
|
INSTALL = @INSTALL@ |
257 |
|
InstallProgram = @INSTALL_PROGRAM@ |
258 |
|
InstallData = @INSTALL_DATA@ |
259 |
< |
MkDir = @MKINSTALLDIRS@ |
259 |
> |
MkDir = @MKINSTALLDIRS@ |
260 |
|
Delete = rm -fr |
261 |
|
StaticArchiver = @AR@ |
262 |
|
DynamicArchiver = @CC@ |
287 |
|
-sourcepath $(SourceDir) |
288 |
|
COptions = $(FrcDeclare) @CFLAGS@ |
289 |
|
CParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CFLAGS@ |
290 |
< |
CppOptions = $(FrcDeclare) @CXXFLAGS@ |
291 |
< |
CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ |
290 |
> |
CppOptions = $(FrcDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ |
291 |
> |
CppParallelOptions = $(FrcDeclare) $(ParallelDeclare) @CXXFLAGS@ @OOPSE_TEMPLATE_FLAGS@ |
292 |
|
FortranOptions = |
293 |
|
F90Options = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(TargetDir) |
294 |
|
F90ParallelOptions = @PREPFLAG@ @F90FLAGS@ @MODDIRFLAG@$(SourceDir) @MODDIRFLAG@$(ParallelTargetDir) @PREPDEFFLAG@$(ParallelDeclare) |
366 |
|
|
367 |
|
# Create target directory |
368 |
|
$(PackageTargetDir) : |
369 |
< |
$(MakeDir) $@ |
369 |
> |
$(MkDir) $@ |
370 |
|
|
371 |
+ |
$(BinDir) : |
372 |
+ |
$(MkDir) $@ |
373 |
+ |
|
374 |
|
# .c -> .o |
375 |
|
$(PackageTargetDir)/%.o : %.c |
376 |
|
$(Print) $@ |
442 |
|
fi |
443 |
|
|
444 |
|
$(MAKE) $(MakeOptions) $(PackageParallelTargetDir)/$@ |
445 |
< |
if test -n "`ls *.$(ModSuffix)`"; then\ |
446 |
< |
$(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ |
447 |
< |
fi |
445 |
> |
if test -n "`ls *.$(ModSuffix)`"; then\ |
446 |
> |
$(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ |
447 |
> |
fi |
448 |
|
|
449 |
|
else |
450 |
|
%.o : %.F90 |
452 |
|
if test -n "`ls *.$(ModSuffix)`"; then\ |
453 |
|
$(Move) "`ls *.$(ModSuffix)`" $(PackageTargetDir);\ |
454 |
|
fi |
450 |
– |
|
455 |
|
endif |
456 |
|
|
457 |
|
|
571 |
|
$(Ranlib) $(CombinedParallelStaticLib) |
572 |
|
|
573 |
|
# Executable |
574 |
< |
$(Executable) : $(CombinedStaticLib) $(ObjectFiles) |
575 |
< |
$(Linker) $(ObjectFiles) $(LinkOptions) $(LibDirs) $(CombinedStaticLib) $(Libraries) -o $@ |
574 |
> |
$(Executable) : $(CombinedStaticLib) $(ObjectFiles) $(BinDir) |
575 |
> |
$(Linker) $(ObjectFiles) $(CombinedStaticLib) $(LinkOptions) $(LibDirs) $(Libraries) -o $@ |
576 |
|
|
577 |
< |
$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) |
578 |
< |
$(Linker) $(ParallelObjectFiles) $(ParallelLinkOptions) $(LibDirs) $(CombinedParallelStaticLib) $(Libraries) -o $@ |
577 |
> |
$(ParallelExecutable) : $(CombinedParallelStaticLib) $(ParallelObjectFiles) $(BinDir) |
578 |
> |
$(Linker) $(ParallelObjectFiles) $(CombinedParallelStaticLib) $(ParallelLinkOptions) $(LibDirs) $(Libraries) -o $@ |
579 |
|
|
580 |
|
# Anything else is just copied from source to target |
581 |
|
$(PackageTargetDir)/% : $(PackageSourceDir)/% |