From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 26 Feb 2013 16:21:01 +0000 (+0000)
Subject: Chainload a possible Makefile in GNUmakefile
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=214697fa700432dac134a87ab36fbf8be36cc077;p=dealii-svn.git

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 39a8da0fc4..104f94bbfe 100644
--- 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)