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

[coffee/mt-apps.git] / Makefile

diff --git a/Makefile b/Makefile
index 7207748741b389af6dc4df7177f2059e84eb4a21..30af7edde99a937c28e94babbf871179ae70f9d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
 OUTPUT_DIR    = build
 
-can_compile   = $(shell 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
@@ -23,37 +22,31 @@ 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
 else
 mtaio_SRCS += mt_sim.c
-mtaio_DEFS += -DSIM=1
-endif
-
-all: mtserver mtkeys mtaio
-
-.PHONY: clean
-
-clean:
-       rm -rf $(OUTPUT_DIR)
+mtaio_DEFS += -DSIM=1 -Ilibwebsockets/include -Llibwebsockets/lib -g
+mtaio_LIBS += -lz $(shell pkg-config --libs openssl)
 
-# Check LWS version and compile our own if not found
-ifeq ($(shell pkg-config libwebsockets = 2.2.1 || echo no),no)
 libwebsockets/CMakeLists.txt:
-       git submodupe update --init libwebsockets
+       git submodule update --init libwebsockets
 
 libwebsockets/CMakeCache.txt: libwebsockets/CMakeLists.txt
-       cd libwebsockets && cmake -DLWS_WITH_LIBEV=ON -DLWS_WITH_SHARED=OFF .
+       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
-
-CFLAGS       += -Ilibwebsockets/include -Llibwebsockets/lib -g -lz $(shell pkg-config --libs openssl)
 endif
 
+.PHONY: clean
+
+clean:
+       rm -rf $(OUTPUT_DIR)
+
 .SECONDEXPANSION:
 mtserver mtkeys mtaio mtrfid: $$($$@_SRCS)
        mkdir -p $(OUTPUT_DIR)