Skip to content
Snippets Groups Projects
Commit a12ed65a authored by Simon Rose's avatar Simon Rose
Browse files

Removed build/install variable definition that came from EPICS 3.13

parent 0661a57b
No related branches found
No related tags found
No related merge requests found
...@@ -572,8 +572,6 @@ $(eval $(1)_VERSION := $(or $(patsubst ${E3_SITEMODS_PATH}/$(1)/%,%,$(firstword ...@@ -572,8 +572,6 @@ $(eval $(1)_VERSION := $(or $(patsubst ${E3_SITEMODS_PATH}/$(1)/%,%,$(firstword
endef endef
$(eval $(foreach m,${REQ},$(call ADD_MANUAL_DEPENDENCIES,$m))) $(eval $(foreach m,${REQ},$(call ADD_MANUAL_DEPENDENCIES,$m)))
INSTALLRULE=install:
BUILDRULE=build:
BASERULES=${EPICS_BASE}/configure/RULES BASERULES=${EPICS_BASE}/configure/RULES
INSTALL_REV = ${MODULE_LOCATION} INSTALL_REV = ${MODULE_LOCATION}
...@@ -728,10 +726,10 @@ debug:: ...@@ -728,10 +726,10 @@ debug::
@echo "LIBVERSION = ${LIBVERSION}" @echo "LIBVERSION = ${LIBVERSION}"
@echo "MODULE_LOCATION = ${MODULE_LOCATION}" @echo "MODULE_LOCATION = ${MODULE_LOCATION}"
${BUILDRULE} MODULEINFOS build: MODULEINFOS
${BUILDRULE} ${MODULEDBD} build: ${MODULEDBD}
${BUILDRULE} $(addprefix ${COMMON_DIR}/,$(addsuffix Record.h,${RECORDS})) build: $(addprefix ${COMMON_DIR}/,$(addsuffix Record.h,${RECORDS}))
${BUILDRULE} ${DEPFILE} build: ${DEPFILE}
# Include default EPICS Makefiles (version dependent). # Include default EPICS Makefiles (version dependent).
# Avoid library installation when doing 'make build'. # Avoid library installation when doing 'make build'.
...@@ -825,7 +823,7 @@ $(foreach d,$(HDR_SUBDIRS),$(eval $(call install_subdirs,$d))) ...@@ -825,7 +823,7 @@ $(foreach d,$(HDR_SUBDIRS),$(eval $(call install_subdirs,$d)))
INSTALLS += ${INSTALL_CFGS} ${INSTALL_SCRS} ${INSTALL_HDRS} ${INSTALL_DBDS} ${INSTALL_DBS} ${INSTALL_LIBS} ${INSTALL_BINS} ${INSTALL_DEPS} ${INSTALL_META} INSTALLS += ${INSTALL_CFGS} ${INSTALL_SCRS} ${INSTALL_HDRS} ${INSTALL_DBDS} ${INSTALL_DBS} ${INSTALL_LIBS} ${INSTALL_BINS} ${INSTALL_DEPS} ${INSTALL_META}
${INSTALLRULE} ${INSTALLS} install: ${INSTALLS}
${INSTALL_DBDS}: $(notdir ${INSTALL_DBDS}) ${INSTALL_DBDS}: $(notdir ${INSTALL_DBDS})
@echo "Installing module dbd file $@" @echo "Installing module dbd file $@"
...@@ -1020,7 +1018,7 @@ ifdef OLD_INCLUDE ...@@ -1020,7 +1018,7 @@ ifdef OLD_INCLUDE
endif endif
# Remove MakefileInclude after we are done because it interfers with our way to build. # Remove MakefileInclude after we are done because it interfers with our way to build.
$(BUILDRULE) build:
$(RM) MakefileInclude $(RM) MakefileInclude
endif # In O.* directory endif # In O.* directory
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment