From 818aa2a185bc784cbf6451e5d3c2f7af46974c21 Mon Sep 17 00:00:00 2001
From: Eliah REBSTOCK <eliah.rebstock@ensiie.fr>
Date: Wed, 11 Jul 2018 21:53:11 +0200
Subject: [PATCH] Add option for architecture in Makefile

---
 Makefile             | 13 ++++++++-----
 log/src/Makefile     |  2 +-
 log/src/ana/Makefile |  2 +-
 psys/src/Makefile    |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index dbc428a..1b3cf6b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
+# ARCH_OPT is the gcc architecture option (probably -m32 or -m64)
+export ARCH_OPT="-m32"
+MAKE="make"
 
 build:
-	cd ./psys/src; make
-	cd ./log/src; make
-	
+	$(MAKE) -C psys/src
+	$(MAKE) -C log/src
+
 
 clean:
-	cd log/src; make clean
-	cd psys/src; make clean
+	$(MAKE) -C psys/src clean
+	$(MAKE) -C log/src clean
 
diff --git a/log/src/Makefile b/log/src/Makefile
index b76b6fb..f41dac1 100644
--- a/log/src/Makefile
+++ b/log/src/Makefile
@@ -154,7 +154,7 @@ CC = $(CHIPMUNKCC)
 ## FreeBSD                      -m32 
 ##
 
-CHIPMUNKFLAGS = -m32
+CHIPMUNKFLAGS = $(ARCH_OPT)
 
 CFLAGS =  $(CHIPMUNKFLAGS) -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
 
diff --git a/log/src/ana/Makefile b/log/src/ana/Makefile
index 69cf0f6..8ee2026 100644
--- a/log/src/ana/Makefile
+++ b/log/src/ana/Makefile
@@ -79,7 +79,7 @@ CC = $(CHIPMUNKCC)
 ## FreeBSD                      -m32
 ##
 
-CHIPMUNKFLAGS = -m32
+CHIPMUNKFLAGS = $(ARCH_OPT)
 
 OPTIONS = -Wall -Wextra
 
diff --git a/psys/src/Makefile b/psys/src/Makefile
index 9e1e126..1223006 100644
--- a/psys/src/Makefile
+++ b/psys/src/Makefile
@@ -165,7 +165,7 @@ FONTS =
 ## Apple OS X                   -m32
 ## FreeBSD                      -m32
 
-CHIPMUNKFLAGS = -m32
+CHIPMUNKFLAGS = $(ARCH_OPT)
 
 OPTIONS = -Wall -Wextra
 
-- 
GitLab