diff --git a/.gitignore b/.gitignore index f7d2fae6eff1565c5257abe397f6b4e5c9bd7cdb..52c69f2e68d549d3c9804c8102f291d6de8658c7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,5 +21,3 @@ __pycache__ require-ess/require.Makefile require-ess/Db/*.db require-ess/Db/*.d -e3.cfg -tools/ess-env.conf diff --git a/configure/E3/DEFINES_REQUIRE b/configure/E3/DEFINES_REQUIRE deleted file mode 100644 index c457312bbf2907f50e9d58761ef91d9baf9bb37b..0000000000000000000000000000000000000000 --- a/configure/E3/DEFINES_REQUIRE +++ /dev/null @@ -1,34 +0,0 @@ - -# Generate E3 setE3Env.bash configuration - -# Remove the genrated indent -define G_E3_VAR0 -endef - -# EPICS_BASE -define G_E3_VAR1 -declare -g DEFAULT_EPICS_BASE=$(E3_MODULES_PATH) -endef - -# E3_REQUIRE_NAME -define G_E3_VAR2 -declare -g DEFAULT_REQUIRE_NAME=$(E3_REQUIRE_NAME) -endef - - -# E3_REQUIRE_VERSION - -define G_E3_VAR3 -declare -g DEFAULT_REQUIRE_VERSION=$(E3_REQUIRE_VERSION) -endef - -define E3_CFG_VARS := -$(G_E3_VAR0) -$(G_E3_VAR1) -$(G_E3_VAR2) -$(G_E3_VAR3) -endef - - -VARS_EXCLUDES+=E3_CFG_VARS -VARS_EXCLUDES+=G_E3_VAR0 diff --git a/configure/RULES b/configure/RULES index 49e2bba9ac5185131d91e86a39aee2e2fe70f329..e35fe641f195cbab110fa222817a460d3d67819c 100644 --- a/configure/RULES +++ b/configure/RULES @@ -5,7 +5,6 @@ include $(TOP)/configure/E3/DEFINES_FT # # We cannot use file operation in CentOS7.4, # because Makefile version is 3.8. -# include $(TOP)/configure/E3/DEFINES_REQUIRE include $(TOP)/configure/E3/RULES_E3 include $(TOP)/configure/E3/RULES_EPICS