aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Germain <bnt.germain@gmail.com>2024-06-08 13:54:08 +0200
committerGitHub <noreply@github.com>2024-06-08 13:54:08 +0200
commitbefcb31d611b8343576159af2d81577900201253 (patch)
treeb5929cffd24cd52d84832d601ee2b42d22bd2b53
parent9a7c7f5f7ec66576447b4d225066cc388f8ca6b0 (diff)
parentf55bc60d8b00af098425ceaf5ca7c84fdb5657e4 (diff)
downloadlanes-befcb31d611b8343576159af2d81577900201253.tar.gz
lanes-befcb31d611b8343576159af2d81577900201253.tar.bz2
lanes-befcb31d611b8343576159af2d81577900201253.zip
Merge pull request #227 from benoit-pierre/pr/fix_incorrect_makefile_indents
Fix incorrect Makefile indents
-rw-r--r--src/Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile b/src/Makefile
index 4990a05..5c6b016 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -124,17 +124,17 @@ all: $(MODULE)/core.$(_SO)
124# Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think) 124# Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think)
125# 125#
126$(MODULE_DIR)/core.$(_SO): $(OBJ) 126$(MODULE_DIR)/core.$(_SO): $(OBJ)
127 mkdir -p $(MODULE_DIR) 127 mkdir -p $(MODULE_DIR)
128 $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@ 128 $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@
129 129
130clean: 130clean:
131 -rm -rf $(MODULE)/core.$(_SO) *.o *.map 131 -rm -rf $(MODULE)/core.$(_SO) *.o *.map
132 132
133#--- 133#---
134# NSLU2 "slug" Linux ARM 134# NSLU2 "slug" Linux ARM
135# 135#
136nslu2: 136nslu2:
137 $(MAKE) all CFLAGS="$(CFLAGS) -I/opt/include -L/opt/lib -D_GNU_SOURCE -lpthread" 137 $(MAKE) all CFLAGS="$(CFLAGS) -I/opt/include -L/opt/lib -D_GNU_SOURCE -lpthread"
138 138
139#--- 139#---
140# Cross compiling to Win32 (MinGW on OS X Intel) 140# Cross compiling to Win32 (MinGW on OS X Intel)
@@ -150,15 +150,15 @@ MINGW_GCC=mingw32-gcc
150 # i686-pc-mingw32-gcc 150 # i686-pc-mingw32-gcc
151 151
152win32: $(WIN32_LUA51)/include/lua.h 152win32: $(WIN32_LUA51)/include/lua.h
153 $(MAKE) build CC=$(MINGW_GCC) \ 153 $(MAKE) build CC=$(MINGW_GCC) \
154 LUA_FLAGS=-I$(WIN32_LUA51)/include \ 154 LUA_FLAGS=-I$(WIN32_LUA51)/include \
155 LUA_LIBS="-L$(WIN32_LUA51) -llua51" \ 155 LUA_LIBS="-L$(WIN32_LUA51) -llua51" \
156 _SO=dll \ 156 _SO=dll \
157 SO_FLAGS=-shared 157 SO_FLAGS=-shared
158 158
159$(WIN32_LUA51)/include/lua.h: 159$(WIN32_LUA51)/include/lua.h:
160 @echo "Usage: make win32 WIN32_LUA51=<path of extracted LuaBinaries dll8 and dev packages>" 160 @echo "Usage: make win32 WIN32_LUA51=<path of extracted LuaBinaries dll8 and dev packages>"
161 @echo " [MINGW_GCC=...mingw32-gcc]" 161 @echo " [MINGW_GCC=...mingw32-gcc]"
162 @false 162 @false
163 163
164.PROXY: all clean nslu2 win32 164.PROXY: all clean nslu2 win32