[cig-commits] r21211 - in seismo/3D/SPECFEM3D_GLOBE/trunk/src: auxiliaries create_header_file meshfem3D shared specfem3D

[elliott.sales.de.andrade at geodynamics.org]

Author: elliott.sales.de.andrade
Date: 2013-01-06 01:14:13 -0800 (Sun, 06 Jan 2013)
New Revision: 21211

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/Makefile
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
   seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile
Log:
Fix some Makefile bits.

While using the correct build directory is important, the Makefiles in
the subdirectories are not put in the builddir, and don't need to
reference it.

Also, build the shared objects when in that directory.

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile	2013-01-06 09:14:06 UTC (rev 21210)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/Makefile	2013-01-06 09:14:13 UTC (rev 21211)
@@ -35,16 +35,16 @@
 ####
 
 default:
-	$(MAKE) -C @top_builddir@ $(DIR)
+	$(MAKE) -C ../.. $(DIR)
 
 all:
-	$(MAKE) -C @top_builddir@ all
+	$(MAKE) -C ../.. all
 
 clean:
-	$(MAKE) -C @top_builddir@ CLEAN=$(DIR) clean
+	$(MAKE) -C ../.. CLEAN=$(DIR) clean
 
 cleanall:
-	$(MAKE) -C @top_builddir@ clean
+	$(MAKE) -C ../.. clean
 
 backup:
 	mkdir -p bak

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile	2013-01-06 09:14:06 UTC (rev 21210)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/create_header_file/Makefile	2013-01-06 09:14:13 UTC (rev 21211)
@@ -35,16 +35,16 @@
 ####
 
 default:
-	$(MAKE) -C @top_builddir@ $(DIR)
+	$(MAKE) -C ../.. $(DIR)
 
 all:
-	$(MAKE) -C @top_builddir@ all
+	$(MAKE) -C ../.. all
 
 clean:
-	$(MAKE) -C @top_builddir@ CLEAN=$(DIR) clean
+	$(MAKE) -C ../.. CLEAN=$(DIR) clean
 
 cleanall:
-	$(MAKE) -C @top_builddir@ clean
+	$(MAKE) -C ../.. clean
 
 backup:
 	mkdir -p bak

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile	2013-01-06 09:14:06 UTC (rev 21210)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/Makefile	2013-01-06 09:14:13 UTC (rev 21211)
@@ -35,16 +35,16 @@
 ####
 
 default:
-	$(MAKE) -C @top_builddir@ $(DIR)
+	$(MAKE) -C ../.. $(DIR)
 
 all:
-	$(MAKE) -C @top_builddir@ all
+	$(MAKE) -C ../.. all
 
 clean:
-	$(MAKE) -C @top_builddir@ CLEAN=$(DIR) clean
+	$(MAKE) -C ../.. CLEAN=$(DIR) clean
 
 cleanall:
-	$(MAKE) -C @top_builddir@ clean
+	$(MAKE) -C ../.. clean
 
 backup:
 	mkdir -p bak

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/Makefile
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/Makefile	2013-01-06 09:14:06 UTC (rev 21210)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/Makefile	2013-01-06 09:14:13 UTC (rev 21211)
@@ -35,16 +35,16 @@
 ####
 
 default:
-	$(MAKE) -C @top_builddir@ $(DIR)
+	$(MAKE) -C ../.. $(DIR)
 
 all:
-	$(MAKE) -C @top_builddir@ all
+	$(MAKE) -C ../.. all
 
 clean:
-	$(MAKE) -C @top_builddir@ CLEAN=$(DIR) clean
+	$(MAKE) -C ../.. CLEAN=$(DIR) clean
 
 cleanall:
-	$(MAKE) -C @top_builddir@ clean
+	$(MAKE) -C ../.. clean
 
 backup:
 	mkdir -p bak

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk	2013-01-06 09:14:06 UTC (rev 21210)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/rules.mk	2013-01-06 09:14:13 UTC (rev 21211)
@@ -27,6 +27,10 @@
 
 #######################################
 
+shared_TARGETS = \
+	$(shared_OBJECTS) \
+	$(EMPTY_MACRO)
+
 shared_OBJECTS = \
 	$O/auto_ner.o \
 	$O/broadcast_compute_parameters.o \

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile	2013-01-06 09:14:06 UTC (rev 21210)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/specfem3D/Makefile	2013-01-06 09:14:13 UTC (rev 21211)
@@ -35,16 +35,16 @@
 ####
 
 default:
-	$(MAKE) -C @top_builddir@ $(DIR)
+	$(MAKE) -C ../.. $(DIR)
 
 all:
-	$(MAKE) -C @top_builddir@ all
+	$(MAKE) -C ../.. all
 
 clean:
-	$(MAKE) -C @top_builddir@ CLEAN=$(DIR) clean
+	$(MAKE) -C ../.. CLEAN=$(DIR) clean
 
 cleanall:
-	$(MAKE) -C @top_builddir@ clean
+	$(MAKE) -C ../.. clean
 
 backup:
 	mkdir -p bak