From f191a96fcc8f489861c1b5bc71e94b70ce393838 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <esalesde@physics.utoronto.ca>
Date: Sun, 5 Jan 2014 23:13:34 -0500
Subject: [PATCH] build: Remove unnecessary creation/deletion of directories.

---
 .gitignore                |  4 ++--
 Makefile.in               | 27 +++++++++++++--------------
 bin/.keep                 |  0
 obj/.keep                 |  0
 src/meshfem2D/Makefile.in |  6 +++---
 src/specfem2D/Makefile.in |  4 ++--
 6 files changed, 20 insertions(+), 21 deletions(-)
 create mode 100644 bin/.keep
 create mode 100644 obj/.keep

diff --git a/.gitignore b/.gitignore
index d123a737f..99c761143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ setup/constants.h
 setup/precision.h
 
 # Build time
-bin
-obj
+bin/*
+obj/*
 *.mod
 
diff --git a/Makefile.in b/Makefile.in
index eef20ccc7..fec2fa1ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,8 +59,6 @@ default: $(DEFAULT)
 
 all: default
 
-required: obj bin
-
 mesh : meshfem2D
 spec : specfem2D
 specfem2D: xspecfem2D
@@ -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:
@@ -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
+
diff --git a/bin/.keep b/bin/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/obj/.keep b/obj/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/meshfem2D/Makefile.in b/src/meshfem2D/Makefile.in
index 0ebe84d65..bbdac713a 100644
--- a/src/meshfem2D/Makefile.in
+++ b/src/meshfem2D/Makefile.in
@@ -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
@@ -109,7 +109,7 @@ OBJS_MESHFEM2D = \
 
 default: scotch_library $(DEFAULT)
 
-all: clean default
+all: default
 
 mesh : meshfem2D
 meshfem2D: xmeshfem2D
@@ -136,7 +136,7 @@ help:
 	@echo "usage: make [executable]"
 	@echo ""
 	@echo "supported executables:"
-	@echo "    xmeshfem3D"
+	@echo "    xmeshfem2D"
 	@echo "    xcheck_quality_external_mesh"
 	@echo ""
 
diff --git a/src/specfem2D/Makefile.in b/src/specfem2D/Makefile.in
index 452ede774..1177adc9a 100644
--- a/src/specfem2D/Makefile.in
+++ b/src/specfem2D/Makefile.in
@@ -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
@@ -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 ""