Fixed upload_lua target in makefile

This commit is contained in:
Samuel A. Dieck 2015-02-13 00:19:26 -06:00
parent 2da23c36ed
commit 44b40f00f3

View File

@ -10,11 +10,12 @@ PORT=/dev/ttyUSB0
# End of user config # End of user config
###################################################################### ######################################################################
HTTP_FILES := $(wildcard http/*html) HTTP_FILES := $(wildcard http/*html)
LUA_FILES := init.lua httpserver.lua
# Print usage # Print usage
usage: usage:
@echo "make upload_http to upload http files only" @echo "make upload_http to upload http files only"
@echo "make upload_program to upload init.lua and httpserver.lua" @echo "make upload_lua to upload init.lua and httpserver.lua"
@echo "make upload to upload all" @echo "make upload to upload all"
# Upload HTTP files only # Upload HTTP files only
@ -22,9 +23,9 @@ upload_http: $(HTTP_FILES)
$(foreach f, $^, $(LUATOOL) -f $(f) -t $(f) -p $(PORT);) $(foreach f, $^, $(LUATOOL) -f $(f) -t $(f) -p $(PORT);)
# Upload httpserver lua files (init and server module) # Upload httpserver lua files (init and server module)
upload_program: init.lua httpserver.lua upload_lua: $(LUA_FILES)
$(LUATOOL) -f init.lua -t init.lua -p $(PORT) $(foreach f, $^, $(LUATOOL) -f $(f) -t $(f) -p $(PORT);)
# Upload all # Upload all
upload: upload_http upload_program upload: upload_http upload_lua