From f96deec65d349d06ef6ad45923c58c4d0aecdf47 Mon Sep 17 00:00:00 2001 From: bel Date: Sat, 13 Sep 2014 11:16:40 +0200 Subject: [PATCH] Update help in Makefile --- Makefile | 5 +++-- resources/Makefile.in-lua | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bc4213a0..b27dc353 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ ifdef WITH_WEBSOCKET CFLAGS += -DUSE_WEBSOCKET ifdef WITH_LUA CFLAGS += -DUSE_TIMERS - LIBS += -lrt + LIBS += -lrt endif endif @@ -144,7 +144,8 @@ help: @echo "make unit_test build unit tests executable" @echo "" @echo " Make Options" - @echo " WITH_LUA=1 build with Lua support" + @echo " WITH_LUA=1 build with Lua support; include Lua as static library" + @echo " WITH_LUA_SHARED=1 build with Lua support; use dynamic linking to liblua5.2.so" @echo " WITH_DEBUG=1 build with GDB debug support" @echo " WITH_IPV6=1 with IPV6 support" @echo " WITH_WEBSOCKET=1 build with web socket support" diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua index 5b39566d..d09fcb6d 100644 --- a/resources/Makefile.in-lua +++ b/resources/Makefile.in-lua @@ -1,4 +1,4 @@ -# +# # Copyright (c) 2013 No Face Press, LLC # License http://opensource.org/licenses/mit-license.php MIT License # @@ -53,9 +53,9 @@ LUA_SOURCE_FILES = lapi.c \ lzio.c $(info Lua linked static) - + endif - + LUA_SOURCES = $(addprefix $(LUA_DIR)/, $(LUA_SOURCE_FILES)) LUA_OBJECTS = $(LUA_SOURCES:.c=.o)