diff --git a/datalink814_ge/build/src/bit_array/subdir.mk b/datalink814_ge/build/src/bit_array/subdir.mk
index cb3add5..8c689f8 100644
--- a/datalink814_ge/build/src/bit_array/subdir.mk
+++ b/datalink814_ge/build/src/bit_array/subdir.mk
@@ -3,15 +3,14 @@
 ################################################################################
 
 # Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/bit_array/bit_array.c 
 
-OBJS += \
-./src/bit_array/bit_array.o 
+BIT_ARRAY_SRC := $(wildcard ../src/bit_array/bit_array*.c)
 
-C_DEPS += \
-./src/bit_array/bit_array.d 
+C_SRCS += $(BIT_ARRAY_SRC)
 
+OBJS += $(patsubst ../src/bit_array/bit_array%.c, ./src/bit_array/bit_array%.o, $(BIT_ARRAY_SRC))
+
+C_DEPS += $(patsubst ../src/bit_array/bit_array%.c, ./src/bit_array/bit_array%.d, $(BIT_ARRAY_SRC))
 
 # Each subdirectory must supply rules for building sources it contributes
 src/bit_array/%.o: ../src/bit_array/%.c
diff --git a/datalink814_ge/build/src/config/subdir.mk b/datalink814_ge/build/src/config/subdir.mk
index 03126e4..b3aef0b 100644
--- a/datalink814_ge/build/src/config/subdir.mk
+++ b/datalink814_ge/build/src/config/subdir.mk
@@ -2,15 +2,14 @@
 # Automatically-generated file. Do not edit!
 ################################################################################
 
-# Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/config/platform.c 
+# Add inputs and outputs from these tool invocations to the build variables
+CONFIG_SRC := $(wildcard ../src/config/*.c)
 
-OBJS += \
-./src/config/platform.o 
+C_SRCS += $(CONFIG_SRC)
 
-C_DEPS += \
-./src/config/platform.d 
+OBJS += $(patsubst ../src/config/%.c, ./src/config/%.o, $(CONFIG_SRC))
+
+C_DEPS += $(patsubst ../src/config/%.c, ./src/config/%.d, $(CONFIG_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes
diff --git a/datalink814_ge/build/src/linklayer/geometry/subdir.mk b/datalink814_ge/build/src/linklayer/geometry/subdir.mk
index 82e988b..be26ce7 100644
--- a/datalink814_ge/build/src/linklayer/geometry/subdir.mk
+++ b/datalink814_ge/build/src/linklayer/geometry/subdir.mk
@@ -3,20 +3,13 @@
 ################################################################################
 
 # Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/linklayer/geometry/coord.c \
-../src/linklayer/geometry/eulerangles.c \
-../src/linklayer/geometry/quaternion.c 
+GEOMETRY_SRC := $(wildcard ../src/linklayer/geometry/*.c)
 
-OBJS += \
-./src/linklayer/geometry/coord.o \
-./src/linklayer/geometry/eulerangles.o \
-./src/linklayer/geometry/quaternion.o 
+C_SRCS += $(GEOMETRY_SRC)
 
-C_DEPS += \
-./src/linklayer/geometry/coord.d \
-./src/linklayer/geometry/eulerangles.d \
-./src/linklayer/geometry/quaternion.d 
+OBJS += $(patsubst ../src/linklayer/geometry/%.c, ./src/linklayer/geometry/%.o, $(GEOMETRY_SRC))
+
+C_DEPS += $(patsubst ../src/linklayer/geometry/%.c, ./src/linklayer/geometry/%.d, $(GEOMETRY_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes
diff --git a/datalink814_ge/build/src/linklayer/subdir.mk b/datalink814_ge/build/src/linklayer/subdir.mk
index 8d73ea9..20d595f 100644
--- a/datalink814_ge/build/src/linklayer/subdir.mk
+++ b/datalink814_ge/build/src/linklayer/subdir.mk
@@ -2,36 +2,14 @@
 # Automatically-generated file. Do not edit!
 ################################################################################
 
-# Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/linklayer/framing.c \
-../src/linklayer/linklayer814.c \
-../src/linklayer/linklayer_routine.c \
-../src/linklayer/net_mgmt.c \
-../src/linklayer/net_scan.c \
-../src/linklayer/net_service.c \
-../src/linklayer/node_list.c \
-../src/linklayer/time_sync.c 
+# Add inputs and outputs from these tool invocations to the build variables
+LINKLAYER_SRC := $(wildcard ../src/linklayer/*.c)
 
-OBJS += \
-./src/linklayer/framing.o \
-./src/linklayer/linklayer814.o \
-./src/linklayer/linklayer_routine.o \
-./src/linklayer/net_mgmt.o \
-./src/linklayer/net_scan.o \
-./src/linklayer/net_service.o \
-./src/linklayer/node_list.o \
-./src/linklayer/time_sync.o 
+C_SRCS += $(LINKLAYER_SRC)
 
-C_DEPS += \
-./src/linklayer/framing.d \
-./src/linklayer/linklayer814.d \
-./src/linklayer/linklayer_routine.d \
-./src/linklayer/net_mgmt.d \
-./src/linklayer/net_scan.d \
-./src/linklayer/net_service.d \
-./src/linklayer/node_list.d \
-./src/linklayer/time_sync.d 
+OBJS += $(patsubst ../src/linklayer/%.c, ./src/linklayer/%.o, $(LINKLAYER_SRC))
+
+C_DEPS += $(patsubst ../src/linklayer/%.c, ./src/linklayer/%.d, $(LINKLAYER_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes
diff --git a/datalink814_ge/build/src/mpc/subdir.mk b/datalink814_ge/build/src/mpc/subdir.mk
index b6a3757..d3df372 100644
--- a/datalink814_ge/build/src/mpc/subdir.mk
+++ b/datalink814_ge/build/src/mpc/subdir.mk
@@ -3,14 +3,13 @@
 ################################################################################
 
 # Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/mpc/mpc_ctrl.c 
+MPC_SRC := $(wildcard ../src/mpc/*.c)
 
-OBJS += \
-./src/mpc/mpc_ctrl.o 
+C_SRCS += $(MPC_SRC)
 
-C_DEPS += \
-./src/mpc/mpc_ctrl.d 
+OBJS += $(patsubst ../src/mpc/%.c, ./src/mpc/%.o, $(MPC_SRC))
+
+C_DEPS += $(patsubst ../src/mpc/%.c, ./src/mpc/%.d, $(MPC_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes
diff --git a/datalink814_ge/build/src/phy_ctrl/subdir.mk b/datalink814_ge/build/src/phy_ctrl/subdir.mk
index 1ba49d7..61a0cc2 100644
--- a/datalink814_ge/build/src/phy_ctrl/subdir.mk
+++ b/datalink814_ge/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_ge/build/src/subdir.mk b/datalink814_ge/build/src/subdir.mk
index d304123..e55936e 100644
--- a/datalink814_ge/build/src/subdir.mk
+++ b/datalink814_ge/build/src/subdir.mk
@@ -6,17 +6,13 @@
 LD_SRCS += \
 ../src/lscript.ld 
 
-C_SRCS += \
-../src/common.c \
-../src/main.c 
+MAIN_SRC := $(wildcard ../src/*.c)
 
-OBJS += \
-./src/common.o \
-./src/main.o 
+C_SRCS += $(UTIL_SRC)
 
-C_DEPS += \
-./src/common.d \
-./src/main.d 
+OBJS += $(patsubst ../src/%.c, ./src/%.o, $(MAIN_SRC))
+
+C_DEPS += $(patsubst ../src/%.c, ./src/%.d, $(MAIN_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes
diff --git a/datalink814_ge/build/src/time_ctrl/subdir.mk b/datalink814_ge/build/src/time_ctrl/subdir.mk
index 7ea3a0e..9958d4a 100644
--- a/datalink814_ge/build/src/time_ctrl/subdir.mk
+++ b/datalink814_ge/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
diff --git a/datalink814_ge/build/src/util/subdir.mk b/datalink814_ge/build/src/util/subdir.mk
index 23e2821..61acb53 100644
--- a/datalink814_ge/build/src/util/subdir.mk
+++ b/datalink814_ge/build/src/util/subdir.mk
@@ -3,17 +3,13 @@
 ################################################################################
 
 # Add inputs and outputs from these tool invocations to the build variables 
-C_SRCS += \
-../src/util/crc.c \
-../src/util/util.c 
+UTIL_SRC := $(wildcard ../src/util/*.c)
 
-OBJS += \
-./src/util/crc.o \
-./src/util/util.o 
+C_SRCS += $(UTIL_SRC)
 
-C_DEPS += \
-./src/util/crc.d \
-./src/util/util.d 
+OBJS += $(patsubst ../src/util/%.c, ./src/util/%.o, $(UTIL_SRC))
+
+C_DEPS += $(patsubst ../src/util/%.c, ./src/util/%.d, $(UTIL_SRC))
 
 
 # Each subdirectory must supply rules for building sources it contributes