From 440232b3c825c83eca6dd7025882818ea74b09b0 Mon Sep 17 00:00:00 2001 From: Simon Rose <simon.rose@ess.eu> Date: Mon, 25 Oct 2021 09:58:45 +0200 Subject: [PATCH] Removed RULES_E3_SITELIBS, RULES_E3_SITEAPPS, and RULES_SITEAPPS. --- configure/E3/RULES_E3 | 2 +- configure/E3/RULES_E3_SITEAPPS | 7 ------- configure/E3/RULES_E3_SITELIBS | 18 ------------------ configure/E3/RULES_SITEAPPS | 14 -------------- configure/E3/RULES_SITEMODS | 2 -- configure/module/RULES_REQUIRE | 3 +++ 6 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 configure/E3/RULES_E3_SITEAPPS delete mode 100644 configure/E3/RULES_E3_SITELIBS delete mode 100644 configure/E3/RULES_SITEAPPS diff --git a/configure/E3/RULES_E3 b/configure/E3/RULES_E3 index 941ea4fa..82dda913 100644 --- a/configure/E3/RULES_E3 +++ b/configure/E3/RULES_E3 @@ -29,7 +29,7 @@ help: ## Install module to $(E3_MODULES_INSTALL_LOCATION) -install: install_module +install: install_module hdrs .PHONY: db db: err_no_db_rule diff --git a/configure/E3/RULES_E3_SITEAPPS b/configure/E3/RULES_E3_SITEAPPS deleted file mode 100644 index fbab8d1a..00000000 --- a/configure/E3/RULES_E3_SITEAPPS +++ /dev/null @@ -1,7 +0,0 @@ - -# Create symbolic links in siteLibs - -.PHONY: install_links - -# GNU find -install_links: hdrs diff --git a/configure/E3/RULES_E3_SITELIBS b/configure/E3/RULES_E3_SITELIBS deleted file mode 100644 index 436d5265..00000000 --- a/configure/E3/RULES_E3_SITELIBS +++ /dev/null @@ -1,18 +0,0 @@ - -# Create symbolic links in siteLibs - -.PHONY: install_links $(INSTALLED_EPICS_BASE_ARCHS) - -# GNU find -install_links: $(INSTALLED_EPICS_BASE_ARCHS) hdrs -# ln -snf $(E3_MODULES_INSTALL_LOCATION_INC) $(E3_MODULES_INSTALL_LOCATION_INC_LINK) -# ln -snf $(E3_MODULES_INSTALL_LOCATION_DB) $(E3_MODULES_INSTALL_LOCATION_DB_LINK) -# ln -snf $(E3_MODULES_INSTALL_LOCATION_BIN) $(E3_MODULES_INSTALL_LOCATION_BIN_LINK) -# ln -snf $(E3_MODULES_INSTALL_LOCATION_LIB) $(E3_MODULES_INSTALL_LOCATION_LIB_LINK) -# ln -sf $(E3_MODULES_INSTALL_LOCATION_DBD) $(E3_MODULES_INSTALL_LOCATION_DBD_LINK) -# find $(E3_SITELIBS_PATH) -xtype l -delete - - -$(INSTALLED_EPICS_BASE_ARCHS): -# mkdir -p $(E3_SITELIBS_PATH)/$@ -# ln -sf $(E3_MODULES_INSTALL_LOCATION)/lib/$@/$(E3_MODULES_LIBNAME) $(E3_SITELIBS_PATH)/$@/$(E3_MODULES_LIBLINKNAME) diff --git a/configure/E3/RULES_SITEAPPS b/configure/E3/RULES_SITEAPPS deleted file mode 100644 index 7c662dd7..00000000 --- a/configure/E3/RULES_SITEAPPS +++ /dev/null @@ -1,14 +0,0 @@ -# -*- mode: Makefile;-*- - -include $(REQUIRE_CONFIG)/RULES_E3 -include $(REQUIRE_CONFIG)/DEFINES_FT -include $(REQUIRE_CONFIG)/RULES_PATCH -include $(REQUIRE_CONFIG)/RULES_E3_SITEAPPS - -include $(REQUIRE_CONFIG)/RULES_DKMS -include $(REQUIRE_CONFIG)/RULES_VARS -#include $(REQUIRE_CONFIG)/RULES_EPICS - -ifneq (,$(findstring dev,$(MAKECMDGOALS))) --include $(REQUIRE_CONFIG)/RULES_DEV -endif diff --git a/configure/E3/RULES_SITEMODS b/configure/E3/RULES_SITEMODS index 2d6c3fd3..3313189a 100644 --- a/configure/E3/RULES_SITEMODS +++ b/configure/E3/RULES_SITEMODS @@ -4,11 +4,9 @@ include $(REQUIRE_CONFIG)/RULES_E3 include $(REQUIRE_CONFIG)/RULES_CELL include $(REQUIRE_CONFIG)/DEFINES_FT include $(REQUIRE_CONFIG)/RULES_PATCH -include $(REQUIRE_CONFIG)/RULES_E3_SITELIBS include $(REQUIRE_CONFIG)/RULES_TEST include $(REQUIRE_CONFIG)/RULES_DKMS include $(REQUIRE_CONFIG)/RULES_VARS -#include $(REQUIRE_CONFIG)/RULES_EPICS include $(REQUIRE_CONFIG)/RULES_DEV diff --git a/configure/module/RULES_REQUIRE b/configure/module/RULES_REQUIRE index c1d04946..5b56c109 100644 --- a/configure/module/RULES_REQUIRE +++ b/configure/module/RULES_REQUIRE @@ -54,6 +54,9 @@ forceuninstall: conf consistency_checks: +.PHONY: hdrs +hdrs: + VARS_EXCLUDES+=FILE_FILTER VARS_EXCLUDES+=E3_SHELL_FILES VARS_EXCLUDES+=E3_IOC_CFG_FILES -- GitLab