From d578bc0556422945f62e636a7e563efafd4c3eb5 Mon Sep 17 00:00:00 2001
From: Ron Sluiter <rsluiter@users.noreply.github.com>
Date: Thu, 17 Oct 2002 18:21:25 +0000
Subject: [PATCH] R3.14.x compatible.

---
 motorExApp/Db/Makefile      | 34 +++++++++++++++++++++++++++++++---
 motorExApp/Db/Makefile.Host | 31 -------------------------------
 2 files changed, 31 insertions(+), 34 deletions(-)
 delete mode 100644 motorExApp/Db/Makefile.Host

diff --git a/motorExApp/Db/Makefile b/motorExApp/Db/Makefile
index 0380f4bf..272adc18 100644
--- a/motorExApp/Db/Makefile
+++ b/motorExApp/Db/Makefile
@@ -1,3 +1,31 @@
-TOP=../..
-include $(TOP)/config/CONFIG_APP
-include $(TOP)/config/RULES_ARCHS
+# Makefile
+TOP = ../..
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
+
+DB += NoMPF.db
+DB += WithMPF.db
+
+#===========================
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
+
+
+# !!WARNING!! Delete the following line after coping
+#	this file to your application.
+MOTOR = $(TOP)
+
+#Cancel implicit rule.
+$(COMMON_DIR)/%.db$(RAW): %.substitutions %.template
+
+#Replace rule with rule without %.template dependency.
+$(COMMON_DIR)/%.db$(RAW): %.substitutions
+	@$(RM) $@$(DEP)
+	@$(DBDDEPENDS_CMD)
+	@echo "Inflating database from $<"
+	@$(RM) $@
+	$(MSI) -V -I $(MOTOR)/db -S $^ > $@
+
diff --git a/motorExApp/Db/Makefile.Host b/motorExApp/Db/Makefile.Host
deleted file mode 100644
index 343a3de9..00000000
--- a/motorExApp/Db/Makefile.Host
+++ /dev/null
@@ -1,31 +0,0 @@
-# Makefile.Host
-TOP = ../../..
-include $(TOP)/config/CONFIG_APP
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-DB += NoMPF.db
-DB += WithMPF.db
-
-include $(TOP)/config/RULES.Db
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-
-# !!WARNING!! Delete the following line after coping
-#	this file to your application.
-MOTOR = $(TOP)
-
-MSI = $(MSITOP)/bin/$(HOST_ARCH)/msi
-
-#The following builds the NoMPF.db file
-../NoMPF.db: ../NoMPF.substitutions $(MOTOR)/db/basic_motor.db
-	echo "building NoMPF.db"
-	$(RM)  ../NoMPF.db
-	$(MSI) -V -I $(MOTOR)/db -S ../NoMPF.substitutions > ../NoMPF.db
-
-#The following builds the WithMPF.db file
-../WithMPF.db: ../WithMPF.substitutions $(MOTOR)/db/basic_motor.db
-	echo "building WithMPF.db"
-	$(RM)  ../WithMPF.db
-	$(MSI) -V -I $(MOTOR)/db -S ../WithMPF.substitutions > ../WithMPF.db
-