auto-sync

firmware/Makefile

@@ -128,7 +128,6 @@ CSRC = $(PORTSRC) \
 	$(UTILSRC) \
 	$(ENGINES_SRC) \
 	$(CONSOLESRC) \
-	$(CONSOLEUTILSRC) \
 	$(HALSRC) \
 	$(DEV_SRC) \
 	$(HW_LAYER_EMS) \

firmware/util/util.mk

@@ -1,12 +1,9 @@
 
-UTIL_TEST_SRC = $(PROJECT_DIR)/util/crc.c \
+UTILSRC = $(PROJECT_DIR)/util/crc.c \
 	$(PROJECT_DIR)/util/data_buffer.c \
+	$(PROJECT_DIR)/console_util/rfiutil.c \
 	$(PROJECT_DIR)/util/histogram.c
 
-UTILSRC = $(UTIL_TEST_SRC)
-
-CONSOLEUTILSRC = $(PROJECT_DIR)/console_util/rfiutil.c
-	
 UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \
 	$(PROJECT_DIR)/console_util/datalogging.cpp \
 	$(PROJECT_DIR)/console_util/loggingcentral.cpp \

unit_tests/Makefile

@@ -84,7 +84,7 @@ include test.mk
 
 # C sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
-CSRC =	$(UTIL_TEST_SRC) \
+CSRC =	$(UTILSRC) \
 	$(CONTROLLERS_ALGO_SRC) \
 	$(CONTROLLERS_CORE_SRC) \
 	$(CONTROLLERS_MATH_SRC) \

win32_functional_tests/Makefile

@@ -102,7 +102,6 @@ CSRC =	${PORTSRC} \
 	$(TRIGGER_SRC) \
 	$(SYSTEMSRC) \
 	$(CONSOLESRC) \
-	$(CONSOLEUTILSRC) \
 	$(CONTROLLERS_ALGO_SRC) \
 	$(CONTROLLERS_CORE_SRC) \
 	$(CONTROLLERS_MATH_SRC) \