From 96a56aa5e13e2f6c99fe03997e80d35bf15e8cee Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 21 Oct 2021 14:26:28 +0200
Subject: [PATCH] Moved RULES_DB/RULES_REQUIRE to separate subfolder
---
configure/CONFIG | 2 +-
configure/RULES | 4 ++--
configure/{E3 => module}/RULES_DB | 2 ++
configure/{E3 => module}/RULES_REQUIRE | 0
4 files changed, 5 insertions(+), 3 deletions(-)
rename configure/{E3 => module}/RULES_DB (68%)
rename configure/{E3 => module}/RULES_REQUIRE (100%)
diff --git a/configure/CONFIG b/configure/CONFIG
index a6f25bee..c4970f13 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -24,9 +24,9 @@ include $(TOP)/configure/E3/CONFIG_REQUIRE
include $(TOP)/configure/E3/CONFIG_SHELL
include $(TOP)/configure/E3/CONFIG_E3_PATH
include $(TOP)/configure/E3/CONFIG_E3_MAKEFILE
+include $(TOP)/configure/E3/CONFIG_TEST
include $(TOP)/configure/E3/CONFIG_EPICS
include $(TOP)/configure/E3/CONFIG_EXPORT
-include $(TOP)/configure/E3/CONFIG_TEST
VARS_EXCLUDES+=BASE_3_14
diff --git a/configure/RULES b/configure/RULES
index a22a8c59..aced32ca 100644
--- a/configure/RULES
+++ b/configure/RULES
@@ -9,10 +9,10 @@ include $(TOP)/configure/E3/RULES_E3
include $(TOP)/configure/E3/RULES_EPICS
-include $(TOP)/configure/E3/RULES_REQUIRE
+include $(TOP)/configure/module/RULES_REQUIRE
include $(TOP)/configure/E3/RULES_PATCH
-include $(TOP)/configure/E3/RULES_DB
+include $(TOP)/configure/module/RULES_DB
include $(TOP)/configure/E3/RULES_VARS
include $(TOP)/configure/module/RULES_TEST
diff --git a/configure/E3/RULES_DB b/configure/module/RULES_DB
similarity index 68%
rename from configure/E3/RULES_DB
rename to configure/module/RULES_DB
index 9c751131..e2f8c953 100644
--- a/configure/E3/RULES_DB
+++ b/configure/module/RULES_DB
@@ -2,6 +2,8 @@
## This RULE should be used in case of inflating DB files
##
+# TODO: This belong in configure/module, same as for other modules
+
.PHONY: db
diff --git a/configure/E3/RULES_REQUIRE b/configure/module/RULES_REQUIRE
similarity index 100%
rename from configure/E3/RULES_REQUIRE
rename to configure/module/RULES_REQUIRE
--
GitLab