From 96e89d34eb2acfd71de6ed38d7029d7f662b9ad5 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Thu, 21 Jul 2016 16:12:38 -0400 Subject: Conditionalize feature sets, to make it easier to build for an embedded environment. The biggest things we need are 1) No dynamic memory allocations 2) No socket oriented I/O While doing so, I've tried to make sure it still works in other build scenarios (hosted Linux build with malloc). --- Makefile | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3062635..8c61c59 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,36 @@ DYNAMIC_LIB ?= 1 STATIC_LIB ?= 1 # Run tests by default TESTS ?= 1 +# Store passwords with minimal crypto protection +CRYPT ?= 1 +CFLAGS += -DDO_CRYPT=$(CRYPT) +# Read and execute commands from a file +FILE ?= 1 +CFLAGS += -DDO_FILE=$(FILE) +# Filter commands +FILTER ?= 1 +CFLAGS += -DDO_FILTER=$(FILTER) +# Support idle timeout +IDLE_TIMEOUT ?= 1 +CFLAGS += -DDO_IDLE_TIMEOUT=$(IDLE_TIMEOUT) +# Use dynamic memory in the library +MALLOC ?= 1 +CFLAGS += -DDO_MALLOC=$(MALLOC) +# buffered print +PRINT_BUFFERED ?= 1 +CFLAGS += -DDO_PRINT_BUFFERED=$(PRINT_BUFFERED) +# Support regular/periodic events +REGULAR ?= 1 +CFLAGS += -DDO_REGULAR=$(REGULAR) +# I/O over sockets +SOCKET ?= 1 +CFLAGS += -DDO_SOCKET=$(SOCKET) +# Tab completion of commandsd +TAB_COMPLETION ?= 1 +CFLAGS += -DDO_TAB_COMPLETION=$(TAB_COMPLETION) +# Telnet option negotiation +TELNET ?= 1 +CFLAGS += -DDO_TELNET=$(TELNET) UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not') DESTDIR = @@ -17,7 +47,7 @@ LIB_STATIC = libcli.a CC = gcc AR = ar -ARFLAGS = rcs +ARFLAGS ?= rcs DEBUG = -g OPTIM = -O3 override CFLAGS += $(DEBUG) $(OPTIM) -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter @@ -28,8 +58,10 @@ ifeq ($(UNAME),Darwin) override LDFLAGS += -Wl,-install_name,$(LIB).$(MAJOR).$(MINOR) else override LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR).$(MINOR) +ifeq (1,$(CRYPT)) LIBS = -lcrypt endif +endif ifeq (1,$(DYNAMIC_LIB)) TARGET_LIBS += $(LIB) @@ -54,8 +86,8 @@ $(LIB_STATIC): libcli.o libcli.o: libcli.h -clitest: clitest.o $(LIB) - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -L. -lcli +clitest: clitest.o $(TARGET_LIBS) + $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -L. -lcli $(LIBS) clitest.exe: clitest.c libcli.o $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< libcli.o -lws2_32 -- cgit v1.2.3