From 66028800f7b806ac1ac359836ddc89e945f4e6d2 Mon Sep 17 00:00:00 2001
From: baobrien <baobrien@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 23 Sep 2015 16:00:14 +0000
Subject: [PATCH] Applied Stuart's makefile cleanup patches

git-svn-id: https://svn.code.sf.net/p/freetel/code@2351 01035d8c-6547-0410-b346-abe4f91aad63
---
 codec2-dev/stm32/Makefile | 448 ++++++++++++++++++++++++++++++++++----
 1 file changed, 402 insertions(+), 46 deletions(-)

diff --git a/codec2-dev/stm32/Makefile b/codec2-dev/stm32/Makefile
index 3ad049c9..cb0706b3 100644
--- a/codec2-dev/stm32/Makefile
+++ b/codec2-dev/stm32/Makefile
@@ -1,15 +1,19 @@
 # Makefile for stm32f4 Codec 2 test programs
 
+# Include local definitions if they exist.
+-include local.mak
+
 ###################################################
 
 FLOAT_TYPE=hard
 
 ###################################################
 
-BINPATH=
-CC=$(BINPATH)arm-none-eabi-gcc
-OBJCOPY=$(BINPATH)arm-none-eabi-objcopy
-SIZE=$(BINPATH)arm-none-eabi-size
+CROSS_COMPILE ?= arm-none-eabi-
+CC=$(BINPATH)$(CROSS_COMPILE)gcc
+OBJCOPY=$(BINPATH)$(CROSS_COMPILE)objcopy
+SIZE=$(BINPATH)$(CROSS_COMPILE)size
+SUDO ?= sudo
 
 ###################################################
 
@@ -42,6 +46,330 @@ CFLAGS		+= -DUSE_STDPERIPH_DRIVER -I$(STM32F4LIB)/inc -I$(STM32F4TEMPLATE)
 CFLAGS		+= -I$(CMSIS)/Include -I$(CMSIS)/Device/ST/STM32F4xx/Include
 CFLAGS		+= -DARM_MATH_CM4
 
+# Precious files that should be preserved at all cost!
+.PRECIOUS: dl/$(PERIPHLIBZIP)
+
+STM32F4LIB_SRCS=\
+$(STM32F4LIB)/src/misc.c\
+$(STM32F4LIB)/src/stm32f4xx_adc.c\
+$(STM32F4LIB)/src/stm32f4xx_can.c\
+$(STM32F4LIB)/src/stm32f4xx_cec.c\
+$(STM32F4LIB)/src/stm32f4xx_crc.c\
+$(STM32F4LIB)/src/stm32f4xx_cryp_aes.c\
+$(STM32F4LIB)/src/stm32f4xx_cryp.c\
+$(STM32F4LIB)/src/stm32f4xx_cryp_des.c\
+$(STM32F4LIB)/src/stm32f4xx_cryp_tdes.c\
+$(STM32F4LIB)/src/stm32f4xx_dac.c\
+$(STM32F4LIB)/src/stm32f4xx_dbgmcu.c\
+$(STM32F4LIB)/src/stm32f4xx_dcmi.c\
+$(STM32F4LIB)/src/stm32f4xx_dma2d.c\
+$(STM32F4LIB)/src/stm32f4xx_dma.c\
+$(STM32F4LIB)/src/stm32f4xx_exti.c\
+$(STM32F4LIB)/src/stm32f4xx_flash.c\
+$(STM32F4LIB)/src/stm32f4xx_flash_ramfunc.c\
+$(STM32F4LIB)/src/stm32f4xx_fmpi2c.c\
+$(STM32F4LIB)/src/stm32f4xx_fsmc.c\
+$(STM32F4LIB)/src/stm32f4xx_gpio.c\
+$(STM32F4LIB)/src/stm32f4xx_hash.c\
+$(STM32F4LIB)/src/stm32f4xx_hash_md5.c\
+$(STM32F4LIB)/src/stm32f4xx_hash_sha1.c\
+$(STM32F4LIB)/src/stm32f4xx_i2c.c\
+$(STM32F4LIB)/src/stm32f4xx_iwdg.c\
+$(STM32F4LIB)/src/stm32f4xx_ltdc.c\
+$(STM32F4LIB)/src/stm32f4xx_pwr.c\
+$(STM32F4LIB)/src/stm32f4xx_qspi.c\
+$(STM32F4LIB)/src/stm32f4xx_rcc.c\
+$(STM32F4LIB)/src/stm32f4xx_rng.c\
+$(STM32F4LIB)/src/stm32f4xx_rtc.c\
+$(STM32F4LIB)/src/stm32f4xx_sai.c\
+$(STM32F4LIB)/src/stm32f4xx_sdio.c\
+$(STM32F4LIB)/src/stm32f4xx_spdifrx.c\
+$(STM32F4LIB)/src/stm32f4xx_spi.c\
+$(STM32F4LIB)/src/stm32f4xx_syscfg.c\
+$(STM32F4LIB)/src/stm32f4xx_tim.c\
+$(STM32F4LIB)/src/stm32f4xx_usart.c\
+$(STM32F4LIB)/src/stm32f4xx_wwdg.c
+
+# Not compiling for now
+# $(STM32F4LIB)/src/stm32f4xx_fmc.c
+
+STM32F4LIB_OBJS = $(STM32F4LIB_SRCS:.c=.o)
+
+CMSIS_SRCS=\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_abs_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_abs_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_abs_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_abs_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_add_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_add_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_add_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_add_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_dot_prod_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_mult_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_mult_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_mult_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_mult_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_negate_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_negate_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_negate_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_negate_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_offset_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_offset_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_offset_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_offset_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_scale_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_scale_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_scale_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_scale_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_shift_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_shift_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_shift_q7.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_sub_f32.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_sub_q15.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_sub_q31.c\
+$(CMSIS)/DSP_Lib/Source/BasicMathFunctions/arm_sub_q7.c\
+$(CMSIS)/DSP_Lib/Source/CommonTables/arm_common_tables.c\
+$(CMSIS)/DSP_Lib/Source/CommonTables/arm_const_structs.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_f32.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q15.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_conj_q31.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_f32.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q15.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_q31.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_f32.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q15.c\
+$(CMSIS)/DSP_Lib/Source/ComplexMathFunctions/arm_cmplx_mult_real_q31.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_pid_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_pid_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_f32.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q15.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_pid_reset_q31.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_f32.c\
+$(CMSIS)/DSP_Lib/Source/ControllerFunctions/arm_sin_cos_q31.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_cos_f32.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_cos_q15.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_cos_q31.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_sin_f32.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_sin_q15.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_sin_q31.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q15.c\
+$(CMSIS)/DSP_Lib/Source/FastMathFunctions/arm_sqrt_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df1_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_f64.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_opt_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_fast_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_opt_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_opt_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_fast_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_opt_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_partial_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_conv_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_opt_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_fast_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_opt_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_correlate_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_fast_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_decimate_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_fast_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_init_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_interpolate_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_lattice_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_init_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_fir_sparse_q7.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_iir_lattice_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_norm_q31.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_q15.c\
+$(CMSIS)/DSP_Lib/Source/FilteringFunctions/arm_lms_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_add_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_add_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_cmplx_mult_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_inverse_f64.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_fast_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_mult_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_scale_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_sub_q31.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_f32.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q15.c\
+$(CMSIS)/DSP_Lib/Source/MatrixFunctions/arm_mat_trans_q31.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_max_f32.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_max_q15.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_max_q31.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_max_q7.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_mean_f32.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_mean_q15.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_mean_q31.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_mean_q7.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_min_f32.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_min_q15.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_min_q31.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_min_q7.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_power_f32.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_power_q15.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_power_q31.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_power_q7.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_rms_f32.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_rms_q15.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_rms_q31.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_std_f32.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_std_q15.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_std_q31.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_var_f32.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_var_q15.c\
+$(CMSIS)/DSP_Lib/Source/StatisticsFunctions/arm_var_q31.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_copy_f32.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_copy_q15.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_copy_q31.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_copy_q7.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_fill_f32.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_fill_q15.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_fill_q31.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_fill_q7.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_float_to_q15.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_float_to_q31.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_float_to_q7.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q15_to_float.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q15_to_q31.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q15_to_q7.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q31_to_float.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q31_to_q15.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q31_to_q7.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q7_to_float.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q7_to_q15.c\
+$(CMSIS)/DSP_Lib/Source/SupportFunctions/arm_q7_to_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_bitreversal.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix2_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix4_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_cfft_radix8_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_dct4_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_dct4_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_dct4_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_dct4_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_dct4_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_fast_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_init_f32.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_init_q31.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_q15.c\
+$(CMSIS)/DSP_Lib/Source/TransformFunctions/arm_rfft_q31.c\
+
+CMSIS_OBJS = $(CMSIS_SRCS:.c=.o)
+
 ###################################################
 
 # Codec 2
@@ -79,7 +407,7 @@ CFLAGS += -I../unittest
 CFLAGS += -Iinc
 
 FFT_TEST_SRCS = \
-$(DSPLIB)/Examples/arm_fft_bin_example/arm_fft_bin_data.c \
+$(DSPLIB)/Examples/arm_fft_bin_example/GCC/arm_fft_bin_data.c \
 fft_test.c \
 src/startup_stm32f4xx.s \
 stm32f4_machdep.c \
@@ -99,7 +427,7 @@ LIBPATHS =
 
 # Libraries to link
 
-LIBS = libstm32f4.a -lg -lnosys -lm
+LIBS = -lg -lnosys -lm
 
 # startup file
 
@@ -109,21 +437,45 @@ OBJS = $(SRCS:.c=.o)
 
 ###################################################
 
-all: libstm32f4.a codec2_profile.elf fft_test.elf dac_ut.elf dac_play.elf adc_rec.elf pwm_ut.elf fdmdv_profile.elf sm1000_leds_switches_ut.elf sm1000.elf adcdac_ut.elf freedv_tx_profile.elf freedv_rx_profile.elf adc_sd.elf usb_vcp_ut.elf tuner_ut.elf fast_dac_ut.elf adc_sfdr_ut.elf
+all: codec2_profile.bin fft_test.bin dac_ut.bin dac_play.bin adc_rec.bin pwm_ut.bin fdmdv_profile.bin sm1000_leds_switches_ut.bin sm1000.bin adcdac_ut.bin freedv_tx_profile.bin freedv_rx_profile.bin adc_sd.bin usb_vcp_ut.bin tuner_ut.bin fast_dac_ut.bin adc_sfdr_ut.bin
+
+# Rule for making directories automatically.
+# Note we don't use -p as it's a GNU extension.
+%/.md:
+	parent=$(shell dirname $(@D) ); \
+		[ -d $${parent} ] || $(MAKE) $${parent}/.md
+	[ -d $(@D) ] || mkdir $(@D)
+	touch $@
+
+dl/$(PERIPHLIBZIP): dl/.md
+	wget -O$@.part -c $(PERIPHLIBURL)/$(PERIPHLIBZIP)
+	mv $@.part $@
+	touch $@
+
+$(PERIPHLIBDIR)/.unpack: dl/$(PERIPHLIBZIP)
+	test ! -d $(PERIPHLIBDIR)_$(PERIPHLIBVER) || \
+		rm -fr $(PERIPHLIBDIR)_$(PERIPHLIBVER)
+	unzip dl/$(PERIPHLIBZIP)
+	test ! -d $(PERIPHLIBDIR) || rm -fr $(PERIPHLIBDIR)
+	mv $(PERIPHLIBDIR)_$(PERIPHLIBVER) $(PERIPHLIBDIR)
+	touch $@
 
-dl/$(PERIPHLIBZIP):
-	mkdir -p dl
-	cd dl; wget $(PERIPHLIBURL)/$(PERIPHLIBZIP)
+$(CMSIS_OBJS) $(STM32F4LIB_OBJS): $(PERIPHLIBDIR)/.unpack
 
-$(PERIPHLIBDIR): dl/$(PERIPHLIBZIP)
-	cd dl; unzip $(PERIPHLIBZIP)
-	mv dl/$(PERIPHLIBDIR)_$(PERIPHLIBVER) $(PERIPHLIBDIR)
+libstm32f4.a: $(CMSIS_OBJS) $(STM32F4LIB_OBJS)
+	find $(PERIPHLIBDIR) -type f -name '*.o' -exec $(AR) crs libstm32f4.a {} ";"
 
-libstm32f4.a: $(PERIPHLIBDIR)
-	$(MAKE) $(STM32F4TEMPLATE)/system_stm32f4xx.o
-	for F in $(STM32F4LIB)/src/*.c ; do $(MAKE) $${F%.c}.o ; done
-	for F in $(CMSIS)/DSP_Lib/Source/*/*.c ; do $(MAKE) $${F%.c}.o ; done
-	find $(PERIPHLIBDIR) -type f -name '*.o' -exec $(AR) crs libstm32f4.a {} ";"	
+# Kludgy target to build a file with CFLAGS -O3
+%.O3.o: %.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -O3 -c -o $@ $<
+
+# Rule for building .bin files from a .elf
+%.bin: %.elf
+	$(OBJCOPY) -O binary $< $@
+
+# Rule for programming the SM1000
+%.pgm: %.bin
+	$(SUDO) dfu-util -d 0483:df11 -c 1 -i 0 -a 0 -s 0x08000000 -D $<
 
 ####################################################
 
@@ -136,10 +488,10 @@ src/init.c \
 src/system_stm32f4xx.c
 CODEC2_PROFILE_SRCS += $(CODEC2_SRCS)
 
-codec2_profile.elf: $(CODEC2_PROFILE_SRCS) 
+codec2_profile.elf: $(CODEC2_PROFILE_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) -DPROFILE $^ -o $@ $(LIBPATHS) $(LIBS)
 
-fft_test.elf: $(FFT_TEST_SRCS)
+fft_test.elf: $(FFT_TEST_SRCS:.c=.o)
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 DAC_UT_SRCS=\
@@ -151,9 +503,8 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-dac_ut.elf: $(DAC_UT_SRCS)
+dac_ut.elf: $(DAC_UT_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) -O0 $^ -o $@ $(LIBPATHS) $(LIBS)
-	$(OBJCOPY) -O binary dac_ut.elf dac_ut.bin
 
 FAST_DAC_UT_SRCS=\
 src/fast_dac_ut.c \
@@ -166,9 +517,8 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-fast_dac_ut.elf: $(FAST_DAC_UT_SRCS)
+fast_dac_ut.elf: $(FAST_DAC_UT_SRCS:.c=.O3.o) libstm32f4.a
 	$(CC) $(CFLAGS) -O3 $^ -o $@ $(LIBPATHS) $(LIBS)
-	$(OBJCOPY) -O binary fast_dac_ut.elf fast_dac_ut.bin
 
 ADCDAC_UT_SRCS=\
 src/adcdac_ut.c \
@@ -181,9 +531,8 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-adcdac_ut.elf: $(ADCDAC_UT_SRCS)
+adcdac_ut.elf: $(ADCDAC_UT_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) -O0 $^ -o $@ $(LIBPATHS) $(LIBS)
-	$(OBJCOPY) -O binary adcdac_ut.elf adcdac_ut.bin
 
 DAC_PLAY_SRCS=\
 src/dac_play.c \
@@ -195,7 +544,7 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-dac_play.elf: $(DAC_PLAY_SRCS)
+dac_play.elf: $(DAC_PLAY_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) -O0 $^ -o $@ $(LIBPATHS) $(LIBS)
 
 ADC_REC_SRCS=\
@@ -208,7 +557,7 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-adc_rec.elf: $(ADC_REC_SRCS)
+adc_rec.elf: $(ADC_REC_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 ADC_SD_SRCS=\
@@ -222,7 +571,7 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-adc_sd.elf: $(ADC_SD_SRCS)
+adc_sd.elf: $(ADC_SD_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 PWM_UT_SRCS=\
@@ -232,7 +581,7 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-pwm_ut.elf: $(PWM_UT_SRCS)
+pwm_ut.elf: $(PWM_UT_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 POWER_UT_SRCS=\
@@ -249,7 +598,7 @@ src/stm32f4_machdep.c \
 
 POWER_UT_SRCS += $(CODEC2_SRCS)
 
-power_ut.elf: $(POWER_UT_SRCS)
+power_ut.elf: $(POWER_UT_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 USB_VCP=\
@@ -277,7 +626,7 @@ USB_VCP_UT+=$(USB_VCP)
 
 CFLAGS += -Iusb_conf -Iusb_lib/cdc -Iusb_lib/core -Iusb_lib/otg
 
-usb_vcp_ut.elf: $(USB_VCP_UT)
+usb_vcp_ut.elf: $(USB_VCP_UT:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 FDMDV_PROFILE_SRCS=\
@@ -290,7 +639,7 @@ src/stm32f4_machdep.c
 
 FDMDV_PROFILE_SRCS += $(CODEC2_SRCS)
 
-fdmdv_profile.elf: $(FDMDV_PROFILE_SRCS)
+fdmdv_profile.elf: $(FDMDV_PROFILE_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) -DPROFILE $^ -o $@ $(LIBPATHS) $(LIBS)
 
 SM1000_LEDS_SWITCHES_UT_SRCS=\
@@ -300,7 +649,8 @@ src/system_stm32f4xx.c \
 src/startup_stm32f4xx.s \
 src/init.c
 
-sm1000_leds_switches_ut.elf: $(SM1000_LEDS_SWITCHES_UT_SRCS)
+sm1000_leds_switches_ut.elf: $(SM1000_LEDS_SWITCHES_UT_SRCS:.c=.o) \
+		libstm32f4.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 SM1000_SRCS=\
@@ -320,9 +670,9 @@ src/stm32f4_dac.o: src/stm32f4_dac.c
 src/stm32f4_adc.o: src/stm32f4_adc.c
 	$(CC) $(CFLAGS)  $^ -c -o $@ 
 
-sm1000.elf: $(SM1000_SRCS) src/stm32f4_dac.o src/stm32f4_adc.o
+sm1000.elf: $(SM1000_SRCS:.c=.O3.o) src/stm32f4_dac.O3.o \
+		src/stm32f4_adc.O3.o libstm32f4.a
 	$(CC) $(CFLAGS) -O3 $^ -o $@ $(LIBPATHS) $(LIBS)
-	$(OBJCOPY) -O binary sm1000.elf sm1000.bin
 
 FREEDV_TX_PROFILE_SRCS=\
 src/freedv_tx_profile.c \
@@ -334,7 +684,7 @@ src/init.c
 
 FREEDV_TX_PROFILE_SRCS += $(CODEC2_SRCS)
 
-freedv_tx_profile.elf: $(FREEDV_TX_PROFILE_SRCS)
+freedv_tx_profile.elf: $(FREEDV_TX_PROFILE_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) -DPROFILE $^ -o $@ $(LIBPATHS) $(LIBS)
 
 FREEDV_RX_PROFILE_SRCS=\
@@ -347,7 +697,7 @@ src/init.c
 
 FREEDV_RX_PROFILE_SRCS += $(CODEC2_SRCS)
 
-freedv_rx_profile.elf: $(FREEDV_RX_PROFILE_SRCS)
+freedv_rx_profile.elf: $(FREEDV_RX_PROFILE_SRCS:.c=.o) libstm32f4.a
 	$(CC) $(CFLAGS) $^ -o $@ $(LIBPATHS) $(LIBS)
 
 FDMDV_DUMP_RT_SRCS=\
@@ -362,7 +712,8 @@ src/init.c
 
 FDMDV_DUMP_RT_SRCS += $(CODEC2_SRCS)
 
-fdmdv_dump_rt.elf: $(FDMDV_DUMP_RT_SRCS) src/stm32f4_dac.o src/stm32f4_adc.o
+fdmdv_dump_rt.elf: $(FDMDV_DUMP_RT_SRCS:.c=.O3.o) \
+		src/stm32f4_dac.O3.o src/stm32f4_adc.o libstm32f4.a
 	$(CC) $(CFLAGS) -O3 $^ -o $@ $(LIBPATHS) $(LIBS)
 
 # ---------------------------------------------------------------------------
@@ -386,9 +737,9 @@ src/init.c \
 src/stm32f4_adc_tuner.o: src/stm32f4_adc_tuner.c
 	$(CC) $(CFLAGS) $^ -c -o $@ 
 
-tuner_ut.elf: $(TUNER_UT_SRCS) src/stm32f4_adc_tuner.o
+tuner_ut.elf: $(TUNER_UT_SRCS:.c=.O3.o) \
+		src/stm32f4_adc_tuner.O3.o libstm32f4.a
 	$(CC) $(CFLAGS) -O3 $^ -o $@ $(LIBPATHS) $(LIBS)
-	$(OBJCOPY) -O binary tuner_ut.elf tuner_ut.bin
 
 # ---------------------------------------------------------------------------
 
@@ -409,14 +760,19 @@ src/init.c \
 src/stm32f4_adc_tuner.o: src/stm32f4_adc_tuner.c
 	$(CC) $(CFLAGS) $^ -c -o $@ 
 
-adc_sfdr_ut.elf: $(ADC_SFDR_UT_SRCS) src/stm32f4_adc_tuner.o
+adc_sfdr_ut.elf: $(ADC_SFDR_UT_SRCS:.c=.o) src/stm32f4_adc_tuner.O3.o \
+		libstm32f4.a
 	$(CC) $(CFLAGS) -O3 $^ -o $@ $(LIBPATHS) $(LIBS)
-	$(OBJCOPY) -O binary adc_sfdr_ut.elf adc_sfdr_ut.bin
 
 # ---------------------------------------------------------------------------------
 
 clean:
-	rm -f *.o
-	rm -f *.elf
+	rm -f *.elf *.bin
 	rm -f libstm32f4.a	
-	find $(PERIPHLIBDIR) -type f -name '*.o' -exec rm {} \;
+	find $(PERIPHLIBDIR) -type f -name '*.o' | xargs rm -f
+
+# ---------------------------------------------------------------------------------
+
+# Objects that require the peripheral library
+src/sm1000_main.o: $(PERIPHLIBDIR)/.unpack
+src/codec2_profile.o: $(PERIPHLIBDIR)/.unpack
-- 
2.25.1