Browse Source

Makefiles: Validate LUA selection or refer to the other Makefile. (#3269)

M.K 3 years ago
parent
commit
9a26e0a94b
5 changed files with 60 additions and 3 deletions
  1. 8 3
      app/Makefile
  2. 14 0
      app/lua/Makefile
  3. 14 0
      app/lua/luac_cross/Makefile
  4. 12 0
      app/lua53/Makefile
  5. 12 0
      app/lua53/host/Makefile

+ 8 - 3
app/Makefile

@@ -16,10 +16,15 @@ TARGET = eagle
 FLAVOR = debug
 
 # Handle Lua Directory selector
-ifeq ("$(LUA)","53")
+ifeq ("$(LUA)","")
+  LUA_DIR := lua
+else ifeq ("$(LUA)","51")
+  LUA_DIR := lua
+else ifeq ("$(LUA)","53")
   LUA_DIR := lua53
 else
-  LUA_DIR := lua
+  $(error Unsupported value "$(LUA)" for variable "LUA", \
+    expected "51", "53" or unset/empty)
 endif
 
 ifndef PDIR # {
@@ -158,7 +163,7 @@ DDEFINES += 						\
 # Required for each makefile to inherit from the parent
 #
 INCLUDES := -I $(PDIR)libc -I $(PDIR)$(LUA_DIR) -I $(PDIR)platform \
-            $(INCLUDES) -I $(PDIR) -I $(PDIR)include 
+            $(INCLUDES) -I $(PDIR) -I $(PDIR)include
 PDIR := ../$(PDIR)
 
 sinclude $(PDIR)Makefile

+ 14 - 0
app/lua/Makefile

@@ -18,6 +18,20 @@ endif
 
 STD_CFLAGS=-std=gnu11 -Wimplicit -Wall
 
+
+# Validate LUA setting
+ifeq ("$(LUA)","")
+else ifeq ("$(LUA)","51")
+  # ok
+else ifeq ("$(LUA)","53")
+  $(error Your variable LUA="$(LUA)" looks like you probably want \
+    app/lua53/Makefile instead)
+else
+  $(error Unsupported value "$(LUA)" for variable "LUA", \
+    expected empty/unset (recommended) or "51")
+endif
+
+
 #############################################################
 # Configuration i.e. compile options etc.
 # Target specific stuff (defines etc.) goes in here!

+ 14 - 0
app/lua/luac_cross/Makefile

@@ -15,6 +15,20 @@ CCFLAGS += -Wall
 
 TARGET = host
 
+
+# Validate LUA setting
+ifeq ("$(LUA)","")
+else ifeq ("$(LUA)","51")
+  # ok
+else ifeq ("$(LUA)","53")
+  $(error Your variable LUA="$(LUA)" looks like you probably want \
+    app/lua53/host/Makefile instead)
+else
+  $(error Unsupported value "$(LUA)" for variable "LUA", \
+    expected empty/unset (recommended) or "51")
+endif
+
+
 VERBOSE ?=
 V ?= $(VERBOSE)
 ifeq ("$(V)","1")

+ 12 - 0
app/lua53/Makefile

@@ -18,6 +18,18 @@ endif
 
 STD_CFLAGS=-std=gnu11 -Wimplicit -Wall
 
+
+# Validate LUA setting
+ifeq ("$(LUA)","53")
+  # ok
+else ifeq ("$(LUA)","51")
+  $(error Your variable LUA="$(LUA)" looks like you probably want \
+    app/lua/Makefile instead)
+else
+  $(error Expected environment variable "LUA" to be "53", not "$(LUA)")
+endif
+
+
 #############################################################
 # Configuration i.e. compile options etc.
 # Target specific stuff (defines etc.) goes in here!

+ 12 - 0
app/lua53/host/Makefile

@@ -23,6 +23,18 @@ else
   # MAKEFLAGS += --silent -w
 endif  # $(V)==1
 
+
+# Validate LUA setting
+ifeq ("$(LUA)","53")
+  # ok
+else ifeq ("$(LUA)","51")
+  $(error Your variable LUA="$(LUA)" looks like you probably want \
+    app/lua/luac_cross/Makefile instead)
+else
+  $(error Expected environment variable "LUA" to be "53", not "$(LUA)")
+endif
+
+
 DEBUG ?=
 ifeq ("$(DEBUG)","1")
     FLAVOR         =   debug