From 2b9b68b5b07af7735bf98e6b4bfcab67be709608 Mon Sep 17 00:00:00 2001
From: Terraneo Federico <fede.tft@miosix.org>
Date: Wed, 14 Oct 2015 23:46:37 +0200
Subject: [PATCH] Some commits ago when adding the polinode board and switching
to C++11 the Makefile.inc was changed, but the MAKEFILE_VERSION was
mistakenly not incremented, which caused issues using git out-of-tree
projects. Incrementing version now, you should update your Makefile.inc if
you are running a git out-of-tree (i.e. you are using submodules)
---
Makefile | 2 +-
miosix/Makefile | 2 +-
miosix/_examples/sad_trombone/Makefile | 2 +-
miosix/config/Makefile.inc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index f53346bb..a72cb50d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
##
## Makefile for Miosix embedded OS
##
-MAKEFILE_VERSION := 1.04
+MAKEFILE_VERSION := 1.05
## Path to kernel directory (edited by init_project_out_of_git_repo.pl)
KPATH := miosix
## Path to config directory (edited by init_project_out_of_git_repo.pl)
diff --git a/miosix/Makefile b/miosix/Makefile
index f7d2f29a..a0f1062a 100644
--- a/miosix/Makefile
+++ b/miosix/Makefile
@@ -2,7 +2,7 @@
## Makefile for Miosix embedded OS
## This makefile builds the whole kernel
##
-MAKEFILE_VERSION := 1.04
+MAKEFILE_VERSION := 1.05
## KPATH and CONFPATH are forwarded by the parent Makefile
include $(CONFPATH)/config/Makefile.inc
diff --git a/miosix/_examples/sad_trombone/Makefile b/miosix/_examples/sad_trombone/Makefile
index 50467d33..406e202c 100644
--- a/miosix/_examples/sad_trombone/Makefile
+++ b/miosix/_examples/sad_trombone/Makefile
@@ -1,7 +1,7 @@
##
## Makefile for Miosix embedded OS
##
-MAKEFILE_VERSION := 1.04
+MAKEFILE_VERSION := 1.05
## Path to kernel directory (edited by init_project_out_of_git_repo.pl)
KPATH := miosix
## Path to config directory (edited by init_project_out_of_git_repo.pl)
diff --git a/miosix/config/Makefile.inc b/miosix/config/Makefile.inc
index da96779e..9bd518ac 100644
--- a/miosix/config/Makefile.inc
+++ b/miosix/config/Makefile.inc
@@ -318,7 +318,7 @@ endif
## a new board or porting Miosix to a new architecture ##
############################################################################
-ifneq ($(MAKEFILE_VERSION),1.04)
+ifneq ($(MAKEFILE_VERSION),1.05)
$(info You are using an incompatible makefile. Make sure it matches \
the one distributed with the current version of the kernel)
$(error Error)
--
GitLab