diff --git a/motorApp/MotorSrc/Makefile.Host b/motorApp/MotorSrc/Makefile.Host
deleted file mode 100644
index b1831c5f..00000000
--- a/motorApp/MotorSrc/Makefile.Host
+++ /dev/null
@@ -1,14 +0,0 @@
-# Makefile.Host
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-RECTYPES += motorRecord.h
-
-INC += motor.h motordevCom.h motordrvCom.h
-INC += motordrvComCode.h
-
-include $(TOP)/config/RULES.Host
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
diff --git a/motorApp/MotorSrc/Makefile.Vx b/motorApp/MotorSrc/Makefile.Vx
deleted file mode 100644
index 4a552913..00000000
--- a/motorApp/MotorSrc/Makefile.Vx
+++ /dev/null
@@ -1,24 +0,0 @@
-# Makefile.Vx
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-# The following are used for debugging messages.
-#USR_CFLAGS += -DDEBUG
-#USR_CXXFLAGS += -DDEBUG
-
-#USR_CFLAGS += -DDMR_SOFTMOTOR_MODS
-
-# The following are required for all motor record configurations.
-SRCS.c += ../motorRecord.c ../motordevCom.c ../motordrvCom.c
-
-LIBOBJS = $(SRCS.c:../%.c=%.o)
-LIBNAME = motorLib
-
-#Note that the command line that builds the
-#library $(LIBNAME) may be HUGE (>3kB)
-#
-include $(TOP)/config/RULES.Vx
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
diff --git a/motorApp/OmsSrc/Makefile b/motorApp/OmsSrc/Makefile
index 0380f4bf..77970c0d 100644
--- a/motorApp/OmsSrc/Makefile
+++ b/motorApp/OmsSrc/Makefile
@@ -1,3 +1,26 @@
-TOP=../..
-include $(TOP)/config/CONFIG_APP
-include $(TOP)/config/RULES_ARCHS
+# Makefile
+TOP = ../..
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+
+# The following are used for debugging messages.
+USR_CFLAGS += -DDEBUG
+USR_CXXFLAGS += -DDEBUG
+
+DBD += devOms.dbd
+
+LIBRARY_IOC_vxWorks = oms
+
+# The following is required for all OMS device drivers.
+SRCS += devOmsCom.cc
+
+# The following is required for the OMS VME8/44 (i.e., devOMS) device driver.
+SRCS += devOms.cc drvOms.cc
+
+# The following is required for the OMS VME58 (i.e., devOms58) device driver.
+SRCS += devOms58.cc drvOms58.cc
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
diff --git a/motorApp/OmsSrc/Makefile.Host b/motorApp/OmsSrc/Makefile.Host
deleted file mode 100644
index 2c4782db..00000000
--- a/motorApp/OmsSrc/Makefile.Host
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile.Host
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-DBDINSTALL += devOms.dbd
-
-include $(TOP)/config/RULES.Host
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
diff --git a/motorApp/OmsSrc/Makefile.Vx b/motorApp/OmsSrc/Makefile.Vx
deleted file mode 100644
index 8fa432ec..00000000
--- a/motorApp/OmsSrc/Makefile.Vx
+++ /dev/null
@@ -1,31 +0,0 @@
-# Makefile.Vx
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-# The following are used for debugging messages.
-#USR_CFLAGS += -DDEBUG
-#USR_CXXFLAGS += -DDEBUG
-
-# The following is required for all OMS device drivers.
-SRCS.c += ../devOmsCom.c
-INSTALLS += devOmsCom.o
-	
-# The following is required for the OMS VME8/44 (i.e., devOMS) device driver.
-SRCS.c += ../devOms.c ../drvOms.c
-INSTALLS += devOms.o drvOms.o
-
-# The following is required for the OMS VME58 (i.e., devOms58) device driver.
-SRCS.c += ../devOms58.c ../drvOms58.c
-INSTALLS += devOms58.o drvOms58.o
-
-LIBOBJS = $(SRCS.c:../%.c=%.o)
-LIBNAME = omsLib
-
-#Note that the command line that builds the
-#library $(LIBNAME) may be HUGE (>3kB)
-#
-include $(TOP)/config/RULES.Vx
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
diff --git a/motorApp/SoftMotorSrc/Makefile b/motorApp/SoftMotorSrc/Makefile
index 0380f4bf..775959e5 100644
--- a/motorApp/SoftMotorSrc/Makefile
+++ b/motorApp/SoftMotorSrc/Makefile
@@ -1,3 +1,21 @@
-TOP=../..
-include $(TOP)/config/CONFIG_APP
-include $(TOP)/config/RULES_ARCHS
+# Makefile
+TOP = ../..
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+
+# The following are used for debugging messages.
+USR_CFLAGS += -DDEBUG
+USR_CXXFLAGS += -DDEBUG
+
+DBD += devSoftMotor.dbd
+
+LIBRARY_IOC = softMotor
+
+# The following is required for the Soft Channel (i.e., MotorSoft) device driver.
+SRCS += devSoft.cc devSoftAux.cc
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
+
diff --git a/motorApp/SoftMotorSrc/Makefile.Host b/motorApp/SoftMotorSrc/Makefile.Host
deleted file mode 100644
index 6d40904a..00000000
--- a/motorApp/SoftMotorSrc/Makefile.Host
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile.Host
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-DBDINSTALL += devSoftMotor.dbd
-
-include $(TOP)/config/RULES.Host
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
diff --git a/motorApp/SoftMotorSrc/Makefile.Vx b/motorApp/SoftMotorSrc/Makefile.Vx
deleted file mode 100644
index 3c929f4f..00000000
--- a/motorApp/SoftMotorSrc/Makefile.Vx
+++ /dev/null
@@ -1,20 +0,0 @@
-# Makefile.Vx
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-#USR_CFLAGS += -DDMR_SOFTMOTOR_MODS
-
-# The following is required for the Soft Channel (i.e., MotorSoft) device driver.
-SRCS.c += ../devSoft.c ../devSoftAux.c
-
-LIBOBJS = $(SRCS.c:../%.c=%.o)
-LIBNAME = softMotorLib
-
-#Note that the command line that builds the
-#library $(LIBNAME) may be HUGE (>3kB)
-#
-include $(TOP)/config/RULES.Vx
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE