From 3ec443153bb0ffd22c363faba89017646562143b Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 8 May 2023 16:41:55 +0200
Subject: [PATCH] Remove separate install_module target

This removal allows us to remove the `hdrs` target from every module; there
were only two modules that still used it, and they have both been fixed.
---
 configure/E3/RULES_CELL        | 2 +-
 configure/E3/RULES_E3          | 7 ++-----
 configure/module/RULES_REQUIRE | 3 ---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/configure/E3/RULES_CELL b/configure/E3/RULES_CELL
index dbda6965..14835ecb 100644
--- a/configure/E3/RULES_CELL
+++ b/configure/E3/RULES_CELL
@@ -5,7 +5,7 @@ cellbuild: build
 
 .PHONY: cellinstall
 ## Installs the module in a local directory $(E3_CELL_PATH)
-cellinstall: install_module fix_permissions
+cellinstall: install fix_permissions
 
 .PHONY: celluninstall
 ## Remove the module from the local directory $(E3_CELL_PATH)
diff --git a/configure/E3/RULES_E3 b/configure/E3/RULES_E3
index 879aafae..dbb3fce5 100644
--- a/configure/E3/RULES_E3
+++ b/configure/E3/RULES_E3
@@ -28,9 +28,6 @@ help:
 
 
 
-## Install module to $(E3_MODULES_INSTALL_LOCATION)
-install: install_module hdrs
-
 .PHONY: db
 db: err_no_db_rule
 
@@ -38,8 +35,8 @@ db: err_no_db_rule
 err_no_db_rule:
 	$(error The 'db' target has been discontinued. If you have custom database expansion rule to use, please contact the e3 team)
 
-.PHONY: install_module
-install_module: build
+## Install module to $(E3_MODULES_INSTALL_LOCATION)
+install: build
 	$(QUIET) $(E3_MODULE_MAKE_CMDS) install
 
 .PHONY: check_uninstall
diff --git a/configure/module/RULES_REQUIRE b/configure/module/RULES_REQUIRE
index 22cd10d5..746874a3 100644
--- a/configure/module/RULES_REQUIRE
+++ b/configure/module/RULES_REQUIRE
@@ -53,9 +53,6 @@ forceuninstall: conf
 
 consistency_checks:
 
-.PHONY: hdrs
-hdrs:
-
 VARS_EXCLUDES+=FILE_FILTER
 VARS_EXCLUDES+=E3_SHELL_FILES
 VARS_EXCLUDES+=E3_IOC_CFG_FILES
-- 
GitLab