mt_server: Use "%s" format string in syslog()

[coffee/mt-apps.git] / Makefile

diff --git a/Makefile b/Makefile
index 4479467a540e2d8a2c58c2588f6c9df1c512faeb..30af7edde99a937c28e94babbf871179ae70f9d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,16 @@
 OUTPUT_DIR    = build
 
-CFLAGS       = -Ilibwebsockets/include -Llibwebsockets/lib
-can_compile   = $(shell set -x; if echo '$(1)' | $(CC) $(CFLAGS) -c -xc - -o /dev/null >/dev/null 2>&1; then echo yes; fi)
-HAVE_RFID    := $(call can_compile,\#include <uFCoder.h>)
-
-ifeq ($(HAVE_RFID),yes)
-all: mtrfid
+ifeq ($(SIM),)
+# Compile for terminal
+all: mtrfid mtserver mtkeys mtaio
 else
-$(warning Compiling without RFID support)
+# Compile just simulator
+all: mtaio
 endif
 
 mtrfid_SRCS   = signal_exit.c mt_rfid.c
 mtrfid_LIBS   = -lev -luFCoder-armhf
+mtrfid_DEFS   = -DHAVE_RFID=1
 
 mtserver_SRCS = signal_exit.c mt_server.c
 mtserver_LIBS = -lev -lwebsockets
@@ -23,12 +22,25 @@ mtaio_SRCS    = signal_exit.c mt_keys.c mt_server.c mt_aio.c mt_blank.c
 mtaio_LIBS    = -lev -lwebsockets
 mtaio_DEFS    = -DNO_MAIN -DHAVE_RFID=$(if $(HAVE_RFID),1,0)
 
-ifeq ($(HAVE_RFID),yes)
+ifeq ($(SIM),)
 mtaio_SRCS += mt_rfid.c
 mtaio_LIBS += -luFCoder-armhf
-endif
+else
+mtaio_SRCS += mt_sim.c
+mtaio_DEFS += -DSIM=1 -Ilibwebsockets/include -Llibwebsockets/lib -g
+mtaio_LIBS += -lz $(shell pkg-config --libs openssl)
+
+libwebsockets/CMakeLists.txt:
+       git submodule update --init libwebsockets
 
-all: mtserver mtkeys mtaio
+libwebsockets/CMakeCache.txt: libwebsockets/CMakeLists.txt
+       cd libwebsockets && cmake -DLWS_WITH_LIBEV=ON -DLWS_WITH_SHARED=OFF -DLWS_WITHOUT_TESTAPPS=ON .
+
+libwebsockets/lib/libwebsockets.a: libwebsockets/CMakeCache.txt
+       cd libwebsockets && cmake --build .
+
+mt_server.c: libwebsockets/lib/libwebsockets.a
+endif
 
 .PHONY: clean
 
@@ -36,6 +48,6 @@ clean:
        rm -rf $(OUTPUT_DIR)
 
 .SECONDEXPANSION:
-mt%: $$($$@_SRCS)
+mtserver mtkeys mtaio mtrfid: $$($$@_SRCS)
        mkdir -p $(OUTPUT_DIR)
        $(CC) $(CFLAGS) $($@_DEFS) -o $(OUTPUT_DIR)/$@ $^ $($@_LIBS)