Fix Makefiles in two places.

git-svn-id: https://svn.dealii.org/trunk@2548 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile
index 82f039f12c884d6136895b3c186aadbe5208ffe1..e24b9541e77bc01290ec76edbc568e87e38f7466 100644 (file)
--- a/deal.II/examples/step-1/Makefile
+++ b/deal.II/examples/step-1/Makefile
@@ -75,7 +75,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -127,7 +127,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'

diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile
index fad7907165665d065b11b7b308ddf9c2a3ec6cb9..2cb2fb48216a45a7c0ddf7d31f6582dc11c000c7 100644 (file)
--- a/deal.II/examples/step-2/Makefile
+++ b/deal.II/examples/step-2/Makefile
@@ -75,7 +75,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -127,7 +127,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'

diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile
index 82f039f12c884d6136895b3c186aadbe5208ffe1..e24b9541e77bc01290ec76edbc568e87e38f7466 100644 (file)
--- a/deal.II/examples/step-3/Makefile
+++ b/deal.II/examples/step-3/Makefile
@@ -75,7 +75,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -127,7 +127,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'

diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile
index 71d81d9dd07ebeebf28c6fb05a83bcf8708e5123..17634e57dd3917cc7a5fbc1d231f53d0c392c3b7 100644 (file)
--- a/deal.II/examples/step-4/Makefile
+++ b/deal.II/examples/step-4/Makefile
@@ -77,7 +77,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -129,7 +129,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'

diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile
index 82f039f12c884d6136895b3c186aadbe5208ffe1..e24b9541e77bc01290ec76edbc568e87e38f7466 100644 (file)
--- a/deal.II/examples/step-5/Makefile
+++ b/deal.II/examples/step-5/Makefile
@@ -75,7 +75,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -127,7 +127,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'

diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile
index 82f039f12c884d6136895b3c186aadbe5208ffe1..e24b9541e77bc01290ec76edbc568e87e38f7466 100644 (file)
--- a/deal.II/examples/step-6/Makefile
+++ b/deal.II/examples/step-6/Makefile
@@ -75,7 +75,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -127,7 +127,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'

diff --git a/deal.II/examples/step-7/Makefile b/deal.II/examples/step-7/Makefile
index 82f039f12c884d6136895b3c186aadbe5208ffe1..e24b9541e77bc01290ec76edbc568e87e38f7466 100644 (file)
--- a/deal.II/examples/step-7/Makefile
+++ b/deal.II/examples/step-7/Makefile
@@ -75,7 +75,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -127,7 +127,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'

diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile
index 82f039f12c884d6136895b3c186aadbe5208ffe1..e24b9541e77bc01290ec76edbc568e87e38f7466 100644 (file)
--- a/deal.II/examples/step-8/Makefile
+++ b/deal.II/examples/step-8/Makefile
@@ -75,7 +75,7 @@ ifeq ($(debug-mode),on)
   libraries = $(target).go $(libs.g)
   flags     = $(CXXFLAGS.g)
 else
-  libraries = $(target).go $(libs.o)
+  libraries = $(target).o $(libs.o)
   flags     = $(CXXFLAGS.o)
 endif
 
@@ -127,7 +127,7 @@ clean:
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 %.o : %.cc
        @echo ==============optimized===== $(<F)
-       @$(CXX) $(CXXFLAGS) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.o) -c $< -o $@
 
 
 # The following statement tells make that the rules `run' and `clean'