Move serialdump and tunslip6 to their own subdir

This commit is contained in:
George Oikonomou 2018-05-26 15:26:20 +01:00
parent c29534f013
commit 3e3cb08c7f
7 changed files with 12 additions and 11 deletions

4
.gitignore vendored
View File

@ -17,8 +17,8 @@ Makefile.target
Makefile.*.defines Makefile.*.defines
tools/doxygen/html tools/doxygen/html
patches-* patches-*
tools/tunslip6 tools/serial-io/tunslip6
tools/serialdump tools/serial-io/serialdump
serialdump-* serialdump-*
build build
tools/coffee-manager/build/ tools/coffee-manager/build/

View File

@ -3,13 +3,15 @@
# recursively invoke the respective build under tools/. # recursively invoke the respective build under tools/.
TOOLS_DIR = $(CONTIKI)/tools TOOLS_DIR = $(CONTIKI)/tools
TOOL_DEPS = $(TOOLS_DIR)/tools-utils.c $(TOOLS_DIR)/tools-utils.h SERIAL_IO_TOOL_DIR = $(TOOLS_DIR)/serial-io
TUNSLIP6 = $(TOOLS_DIR)/tunslip6 SERIAL_IO_TOOL_DEPS = $(addprefix $(SERIAL_IO_TOOL_DIR)/, tools-utils.c tools-utils.h)
SERIAL_DUMP_BIN = $(TOOLS_DIR)/serialdump
$(SERIAL_DUMP_BIN): $(TOOLS_DIR)/serialdump.c $(TOOL_DEPS) TUNSLIP6 = $(SERIAL_IO_TOOL_DIR)/tunslip6
make -C $(TOOLS_DIR) serialdump SERIAL_DUMP_BIN = $(SERIAL_IO_TOOL_DIR)/serialdump
$(TUNSLIP6): $(TOOLS_DIR)/tunslip6.c $(TOOL_DEPS) $(SERIAL_DUMP_BIN): $(SERIAL_IO_TOOL_DIR)/serialdump.c $(SERIAL_IO_TOOL_DEPS)
make -C $(TOOLS_DIR) tunslip6 make -C $(SERIAL_IO_TOOL_DIR) serialdump
$(TUNSLIP6): $(SERIAL_IO_TOOL_DIR)/tunslip6.c $(SERIAL_IO_TOOL_DEPS)
make -C $(SERIAL_IO_TOOL_DIR) tunslip6

View File

@ -30,7 +30,7 @@
* *
*/ */
#include "tools-utils.h" #include "tools-utils.h"
speed_t speed_t
select_baudrate(int baudrate) { select_baudrate(int baudrate) {
@ -159,4 +159,3 @@ select_baudrate(int baudrate) {
return 0; return 0;
} }
} }