Skip to content

Commit

Permalink
build: Remove unnecessary creation/deletion of directories.
Browse files Browse the repository at this point in the history
  • Loading branch information
Elliott Sales de Andrade committed Jan 7, 2014
1 parent 6c511c4 commit f191a96
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ setup/constants.h
setup/precision.h

# Build time
bin
obj
bin/*
obj/*
*.mod

27 changes: 13 additions & 14 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ default: $(DEFAULT)

all: default

required: obj bin

mesh : meshfem2D
spec : specfem2D
specfem2D: xspecfem2D
Expand All @@ -69,46 +67,40 @@ convolve_source_timefunction: xconvolve_source_timefunction
check_quality_external_mesh: xcheck_quality_external_mesh
adj_seismogram: xadj_seismogram

bin:
mkdir -p bin

obj:
mkdir -p obj

##
## mesher
##
xmeshfem2D: required
xmeshfem2D:
$(MAKE) -C src/meshfem2D

##
## check_quality_external_mesh
##
xcheck_quality_external_mesh: required
xcheck_quality_external_mesh:
$(MAKE) -C src/meshfem2D xcheck_quality_external_mesh

##
## solver
##
xspecfem2D: required
xspecfem2D:
$(MAKE) -C src/specfem2D specfem2D

##
## convolve_source_timefunction
##
xconvolve_source_timefunction: required
xconvolve_source_timefunction:
$(MAKE) -C src/specfem2D xconvolve_source_timefunction


##
## adj_seismogram
##
xadj_seismogram: required
xadj_seismogram:
$(MAKE) -C src/specfem2D xadj_seismogram


clean:
rm -rf obj bin src/meshfem2D/*.mod src/specfem2D/*.mod
rm -rf obj/* bin/* src/meshfem2D/*.mod src/specfem2D/*.mod
$(MAKE) -C src/meshfem2D/scotch/src realclean

help:
Expand All @@ -122,3 +114,10 @@ help:
@echo " xadj_seismogram"
@echo ""

.PHONY: default all clean help \
mesh meshfem2D xmeshfem2D \
spec specfem2D xspecfem2D \
convolve_source_timefunction xconvolve_source_timefunction \
check_quality_external_mesh xcheck_quality_external_mesh \
adj_seismogram xadj_seismogram

Empty file added bin/.keep
Empty file.
Empty file added obj/.keep
Empty file.
6 changes: 3 additions & 3 deletions src/meshfem2D/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ S = .
SETUP = ../../setup


##.PHONY: clean default all backup bak generate_databases specfem3D meshfem3D
.PHONY: help clean default all check_quality_external_mesh xcheck_quality_external_mesh mesh meshfem2D xmeshfem2D

####
#### targets
Expand Down Expand Up @@ -109,7 +109,7 @@ OBJS_MESHFEM2D = \

default: scotch_library $(DEFAULT)

all: clean default
all: default

mesh : meshfem2D
meshfem2D: xmeshfem2D
Expand All @@ -136,7 +136,7 @@ help:
@echo "usage: make [executable]"
@echo ""
@echo "supported executables:"
@echo " xmeshfem3D"
@echo " xmeshfem2D"
@echo " xcheck_quality_external_mesh"
@echo ""

Expand Down
4 changes: 2 additions & 2 deletions src/specfem2D/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ SETUP = ../../setup

LIBJPEG = ./libjpeg

##.PHONY: clean default all backup bak generate_databases specfem3D meshfem3D
.PHONY: help clean default all xadj_seismogram convolve_source_timefunction xconvolve_source_timefunction spec specfem2D xspecfem2D

####
#### targets
Expand Down Expand Up @@ -193,7 +193,7 @@ help:
@echo "usage: make [executable]"
@echo ""
@echo "supported executables:"
@echo " xspecfem3D"
@echo " xspecfem2D"
@echo " xconvolve_source_timefunction"
@echo " xadj_seismogram"
@echo ""
Expand Down

0 comments on commit f191a96

Please sign in to comment.