From 74e564697cd400b1d4e3f4b0cffab963c5fe1180 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 26 Feb 2013 16:21:01 +0000 Subject: [PATCH] Chainload a possible Makefile in GNUmakefile git-svn-id: https://svn.dealii.org/branches/branch_cmake@28579 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/GNUmakefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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) -- 2.39.5