Merge branch 'remove_epics_rules' into 'master'

E3-641: Remove "make epics" rules

See merge request e3/e3-require!143

configure/CONFIG

@@ -27,7 +27,6 @@ include $(E3_REQUIRE_CONFIG)/CONFIG_SHELL
 include $(E3_REQUIRE_CONFIG)/CONFIG_E3_PATH
 include $(E3_REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
 include $(E3_REQUIRE_CONFIG)/CONFIG_TEST
-include $(E3_REQUIRE_CONFIG)/CONFIG_EPICS
 include $(E3_REQUIRE_CONFIG)/CONFIG_EXPORT
 
 # Exclude generated EPICS base variables from make vars report.

configure/E3/CONFIG

@@ -13,7 +13,6 @@ include $(E3_REQUIRE_CONFIG)/CONFIG_CELL
 include $(E3_REQUIRE_CONFIG)/CONFIG_TEST
 include $(E3_REQUIRE_CONFIG)/CONFIG_E3_PATH
 include $(E3_REQUIRE_CONFIG)/CONFIG_E3_MAKEFILE
-include $(E3_REQUIRE_CONFIG)/CONFIG_EPICS
 include $(E3_REQUIRE_CONFIG)/CONFIG_DKMS
 include $(E3_REQUIRE_CONFIG)/CONFIG_EXPORT
 

configure/E3/CONFIG_EPICS

-COMMUNITY_EPICS_MODULES:=$(EPICS_BASE)/epics-modules
-
-M_AUTOSAVE:=$(COMMUNITY_EPICS_MODULES)/autosave
-M_DEVLIB2:=$(COMMUNITY_EPICS_MODULES)/devlib2
-M_IOCSTATS:=$(COMMUNITY_EPICS_MODULES)/iocStats
-M_ASYN:=$(COMMUNITY_EPICS_MODULES)/asyn
-M_BUSY:=$(COMMUNITY_EPICS_MODULES)/busy
-M_MODBUS:=$(COMMUNITY_EPICS_MODULES)/modbus
-M_MRFIOC2:=$(COMMUNITY_EPICS_MODULES)/mrfioc2
-M_LUA:=$(COMMUNITY_EPICS_MODULES)/lua
-M_IPMICOMM:=$(COMMUNITY_EPICS_MODULES)/ipmiComm
-M_STREAM:=$(COMMUNITY_EPICS_MODULES)/stream
-M_CALC:=$(COMMUNITY_EPICS_MODULES)/calc
-M_MOTOR:=$(COMMUNITY_EPICS_MODULES)/motor
-M_SSCAN:=$(COMMUNITY_EPICS_MODULES)/sscan
-M_SNCSEQ:=$(COMMUNITY_EPICS_MODULES)/seq
-M_IP:=$(COMMUNITY_EPICS_MODULES)/ip
-M_IPAC:=$(COMMUNITY_EPICS_MODULES)/ipac
-M_ADSUPPORT:=$(COMMUNITY_EPICS_MODULES)/adsupport
-M_ADCORE:=$(COMMUNITY_EPICS_MODULES)/adcore
-M_OPCUA:=$(COMMUNITY_EPICS_MODULES)/opcua
-
-
-
-export M_AUTOSAVE
-export M_DEVLIB2
-export M_IOCSTATS
-export M_ASYN
-export M_BUSY
-export M_MODBUS
-export M_MRFIOC2
-export M_LUA
-export M_IPMICOMM
-export M_STREAM
-export M_CALC
-export M_MOTOR
-export M_SSCAN
-export M_SNCSEQ
-export M_IP
-export M_IPAC
-export M_ADSUPPORT
-export M_ADCORE
-export M_OPCUA
-
-## This is needed since the target "epics" (in configure/RULES_MODULE in most modules)
-## uses SUDOBASH to run the make process
-SUDOBASH := bash -c
-
-### Exclude the following variables to display
-VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
-VARS_EXCLUDES+=M_AUTOSAVE
-VARS_EXCLUDES+=M_DEVLIB2
-VARS_EXCLUDES+=M_IOCSTATS
-VARS_EXCLUDES+=M_ASYN
-VARS_EXCLUDES+=M_BUSY
-VARS_EXCLUDES+=M_MODBUS
-VARS_EXCLUDES+=M_MRFIOC2
-VARS_EXCLUDES+=M_LUA
-VARS_EXCLUDES+=M_IPMICOMM
-VARS_EXCLUDES+=M_STREAM
-VARS_EXCLUDES+=M_CALC
-VARS_EXCLUDES+=M_MOTOR
-VARS_EXCLUDES+=M_SSCAN
-VARS_EXCLUDES+=M_SNCSEQ
-VARS_EXCLUDES+=M_IP
-VARS_EXCLUDES+=M_IPAC
-VARS_EXCLUDES+=M_ADSUPPORT
-VARS_EXCLUDES+=M_ADCORE
-VARS_EXCLUDES+=M_OPCUA
-
-VARS_EXCLUDES+=SUDOBASH

configure/E3/RULES_EPICS

-# One should define the any dependency modules and EPICS base path
-# in the following directory
-
-.PHONY: epics-clean epics-distclean
-
-epics-clean:
-	$(MAKE) -C $(E3_MODULE_SRC_PATH) clean
-
-epics-distclean:
-	$(MAKE) -C $(E3_MODULE_SRC_PATH) distclean

configure/RULES

 # -*- mode: Makefile;-*-
-# include $(EPICS_BASE)/configure/RULES
 
-include $(E3_REQUIRE_CONFIG)/DEFINES_FT
-#
-# We cannot use file operation in CentOS7.4,
-# because Makefile version is 3.8.
 include $(E3_REQUIRE_CONFIG)/RULES_E3
-include $(E3_REQUIRE_CONFIG)/RULES_EPICS
-
-
 include $(TOP)/configure/module/RULES_REQUIRE
-
+include $(E3_REQUIRE_CONFIG)/DEFINES_FT
 include $(E3_REQUIRE_CONFIG)/RULES_PATCH
-include $(E3_REQUIRE_CONFIG)/RULES_VARS
 include $(TOP)/configure/module/RULES_TEST
 
 
+include $(E3_REQUIRE_CONFIG)/RULES_VARS
+
 ifneq (,$(findstring dev,$(MAKECMDGOALS)))
 include $(E3_REQUIRE_CONFIG)/RULES_DEV
 endif