diff --git a/datalink814_sp/build/src/phy_ctrl/subdir.mk b/datalink814_sp/build/src/phy_ctrl/subdir.mk
index 9a26fdb..0577202 100644
--- a/datalink814_sp/build/src/phy_ctrl/subdir.mk
+++ b/datalink814_sp/build/src/phy_ctrl/subdir.mk
@@ -3,17 +3,13 @@
 ################################################################################
 
 # Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/phy_ctrl/antenna.c \
-../src/phy_ctrl/phy_ctrl.c 
+PHY_CTRL_SRC := $(wildcard ../src/phy_ctrl/*.c)
 
-OBJS += \
-./src/phy_ctrl/antenna.o \
-./src/phy_ctrl/phy_ctrl.o 
+C_SRCS += $(PHY_CTRL_SRC)
 
-C_DEPS += \
-./src/phy_ctrl/antenna.d \
-./src/phy_ctrl/phy_ctrl.d 
+OBJS += $(patsubst ../src/phy_ctrl/%.c, ./src/phy_ctrl/%.o, $(PHY_CTRL_SRC))
+
+C_DEPS += $(patsubst ../src/phy_ctrl/%.c, ./src/phy_ctrl/%.d, $(PHY_CTRL_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes
diff --git a/datalink814_sp/build/src/time_ctrl/subdir.mk b/datalink814_sp/build/src/time_ctrl/subdir.mk
index c84497e..64972ff 100644
--- a/datalink814_sp/build/src/time_ctrl/subdir.mk
+++ b/datalink814_sp/build/src/time_ctrl/subdir.mk
@@ -3,14 +3,13 @@
 ################################################################################
 
 # Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/time_ctrl/time_ctrl.c 
+TIME_CTRL_SRC := $(wildcard ../src/time_ctrl/*.c)
 
-OBJS += \
-./src/time_ctrl/time_ctrl.o 
+C_SRCS += $(TIME_CTRL_SRC)
 
-C_DEPS += \
-./src/time_ctrl/time_ctrl.d 
+OBJS += $(patsubst ../src/time_ctrl/%.c, ./src/time_ctrl/%.o, $(TIME_CTRL_SRC))
+
+C_DEPS += $(patsubst ../src/time_ctrl/%.c, ./src/time_ctrl/%.d, $(TIME_CTRL_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes