From b49d9fe7d2ed132926bf22bc2ffcd38b555c8165 Mon Sep 17 00:00:00 2001 From: Robert Ghilduta Date: Sat, 8 Jun 2013 02:12:37 -0700 Subject: [PATCH] cli: make the cli app be conditionally compiled to be interactive --- linux/apps/Makefile | 2 +- linux/apps/src/cli/Makefile | 8 +++++++- linux/apps/src/cli/main.c | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/linux/apps/Makefile b/linux/apps/Makefile index 89f481a5..a480322e 100644 --- a/linux/apps/Makefile +++ b/linux/apps/Makefile @@ -36,7 +36,7 @@ $(BIN_DIR): $(BIN_DIR)/% : $(BIN_DIR) $(MAKE) -C $(SRC_DIR)/$(notdir $@) \ - BIN_DIR="$(abspath $(dir $@))" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + BIN_DIR="$(abspath $(dir $@))" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" INTERACTIVE="$(INTERACTIVE)" clean: rm -rf $(BIN_DIR) diff --git a/linux/apps/src/cli/Makefile b/linux/apps/src/cli/Makefile index d8bac57b..a60e076f 100644 --- a/linux/apps/src/cli/Makefile +++ b/linux/apps/src/cli/Makefile @@ -3,12 +3,18 @@ OBJ := $(SRC:.c=.o) BIN_DIR ?= . +FLAGS ?= $(CFLAGS) + +ifdef INTERACTIVE +FLAGS += -ltecla -DINTERACTIVE +endif + TARGET = $(BIN_DIR)/bladeRF all: $(TARGET) $(TARGET): $(OBJ) - $(CC) $^ $(LDFLAGS) -ltecla -o $(TARGET) + $(CC) $^ $(LDFLAGS) $(FLAGS) -o $(TARGET) clean: rm -f bladeRF diff --git a/linux/apps/src/cli/main.c b/linux/apps/src/cli/main.c index 2fc54df8..f5623a8b 100644 --- a/linux/apps/src/cli/main.c +++ b/linux/apps/src/cli/main.c @@ -8,7 +8,9 @@ #include #include #include +#ifdef INTERACTIVE #include +#endif #include "version.h" @@ -164,6 +166,7 @@ int cmd_probe() #endif static inline int interactive() { +#ifdef INTERACTIVE char *line; bool quit = false; GetLine *gl = new_GetLine(CLI_MAX_LINE_LEN, CLI_MAX_HIST_LEN); @@ -182,6 +185,7 @@ static inline int interactive() } del_GetLine(gl); +#endif return 0; }