diff --git a/.gitignore b/.gitignore index 1785f8349f..cf01804622 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ obj /src/syscall.lua /src/syscall /deps/*.vsn +/src/program/programs.inc diff --git a/src/Makefile b/src/Makefile index 8b2c4bafba..0b269cf0c6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -190,10 +190,10 @@ $(INCOBJ): obj/%_inc.o: %.inc Makefile program/programs.inc | $(OBJDIR) $(Q) luajit -bg -n $(subst /,.,$*)_inc $(basename $@).luainc $@ # Create list of programs that exist -program/programs.inc: +program/programs.inc: FORCE @ls -1d program/*/ | xargs basename -a > $@ -.FORCE: program/programs.inc +FORCE: # extra/ third party bits and pieces obj/strict.o: extra/strict.lua | $(OBJDIR) diff --git a/src/core/main.lua b/src/core/main.lua index 774a5cd435..91dad36285 100644 --- a/src/core/main.lua +++ b/src/core/main.lua @@ -59,7 +59,7 @@ end function usage () print("Usage: "..ffi.string(C.argv[0]).." ...") - local programs = require("program.programs_inc"):gsub("[a-z]+", " %1") + local programs = require("program.programs_inc"):gsub("%S+", " %1") print() print("This snabb executable has the following programs built in:") print(programs)