Chainload a possible Makefile in GNUmakefile

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28579 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/GNUmakefile b/deal.II/GNUmakefile
index 39a8da0fc49a7df4669c29dcda5a0335b4a7e9a7..104f94bbfec90fb02927edeba91eabd7b1b7ed40 100644 (file)
--- a/deal.II/GNUmakefile
+++ b/deal.II/GNUmakefile
@@ -1,4 +1,13 @@
-default:
+#
+# GNUmakefile has priority over Makefile for GNU Make.
+# So if a Makefile was generated by CMake due to an in-source configure
+# chain-load it:
+#
+ifneq ($(wildcard Makefile),)
+  include Makefile
+else
+  default:
+endif
 
 style-h-files:= $(wildcard include/deal.II/*/*.h)
 style-cc-files:= $(wildcard source/*/*.cc)