github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename makefile ENV* variables to OCF_ENV*

Browse Source 
'ENV' variable is set and used by OS utilities  on some Linux
distros, interfering with OCF build system. Renaming ENV and
other ENV* variables to OCF_ENV* to avoid conflicts.

Signed-off-by: Adam Rutkowski <adam.j.rutkowski@intel.com>
This commit is contained in:
Adam Rutkowski 2019-04-20 16:40:54 +02:00
parent d3bfbf6200
commit e11edcacd8
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -24,9 +24,9 @@ else
$(error Not allowed program command) $(error Not allowed program command)
endif endif
ifneq ($(strip $(ENV)),) ifneq ($(strip $(OCF_ENV)),)
ifeq ($(strip $(ENV)),posix) ifeq ($(strip $(OCF_ENV)),posix)
ENVDIR=$(PWD)/env/posix OCF_ENV_DIR=$(PWD)/env/posix
else else
$(error Invalid environment selected) $(error Invalid environment selected)
endif endif
@ -79,30 +79,30 @@ $(SRC_RM): validate
# #
# Installing environment # Installing environment
# #
ENV_IN=$(shell find $(ENVDIR) -name '*.[c|h]' -type f) OCF_ENV_IN=$(shell find $(OCF_ENV_DIR) -name '*.[c|h]' -type f)
ENV_OUT=$(patsubst $(ENVDIR)%,$(OUTDIR)/src/ocf/env/%,$(ENV_IN)) OCF_ENV_OUT=$(patsubst $(OCF_ENV_DIR)%,$(OUTDIR)/src/ocf/env/%,$(OCF_ENV_IN))
ENV_RM=$(shell find $(OUTDIR)/src/ocf/env -name '*.[c|h]' -xtype l 2>/dev/null) OCF_ENV_RM=$(shell find $(OUTDIR)/src/ocf/env -name '*.[c|h]' -xtype l 2>/dev/null)
env: | env_check env_dep env: | env_check env_dep
@$(MAKE) distcleandir @$(MAKE) distcleandir
env_check: env_check:
ifeq ($(ENVDIR),) ifeq ($(OCF_ENV_DIR),)
$(error No environment selected) $(error No environment selected)
endif endif
env_dep: $(ENV_OUT) $(ENV_RM) env_dep: $(OCF_ENV_OUT) $(OCF_ENV_RM)
$(ENV_OUT): $(OCF_ENV_OUT):
ifeq ($(strip $(OUTDIR)),) ifeq ($(strip $(OUTDIR)),)
$(error No output specified for installing sources) $(error No output specified for installing sources)
endif endif
@echo " INSTALL $@" @echo " INSTALL $@"
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@$(INSTALL) $(subst $(OUTDIR)/src/ocf/env,$(ENVDIR),$@) $@ @$(INSTALL) $(subst $(OUTDIR)/src/ocf/env,$(OCF_ENV_DIR),$@) $@
$(ENV_RM): validate $(OCF_ENV_RM): validate
$(if $(shell readlink $@ | grep $(ENVDIR)), \ $(if $(shell readlink $@ | grep $(OCF_ENV_DIR)), \
@echo " RM $@"; rm $@,) @echo " RM $@"; rm $@,)
# #
@ -134,4 +134,4 @@ doc: validate
@cd doc && mv html $(OUTDIR)/doc/ocf @cd doc && mv html $(OUTDIR)/doc/ocf
.PHONY: inc src env env_check env_dep validate help distclean distcleandir doc \ .PHONY: inc src env env_check env_dep validate help distclean distcleandir doc \
$(INC_RM) $(SRC_RM) $(ENV_RM) $(DIST_DIR) $(INC_RM) $(SRC_RM) $(OCF_ENV_RM) $(DIST_DIR)

2
tests/build/Makefile
View File

@ -27,7 +27,7 @@ build: $(OBJS)
sync: sync:
@$(MAKE) -C ${OCFDIR} inc O=$(PWD) @$(MAKE) -C ${OCFDIR} inc O=$(PWD)
@$(MAKE) -C ${OCFDIR} src O=$(PWD) @$(MAKE) -C ${OCFDIR} src O=$(PWD)
@$(MAKE) -C ${OCFDIR} env O=$(PWD) ENV=posix @$(MAKE) -C ${OCFDIR} env O=$(PWD) OCF_ENV=posix
clean: clean:
@rm -rf $(OBJS) @rm -rf $(OBJS)

2
tests/functional/Makefile
View File

@ -34,7 +34,7 @@ sync:
@mkdir -p $(ADAPTERDIR)/ocf @mkdir -p $(ADAPTERDIR)/ocf
@$(MAKE) -C $(OCFDIR) inc O=$(ADAPTERDIR)/ocf @$(MAKE) -C $(OCFDIR) inc O=$(ADAPTERDIR)/ocf
@$(MAKE) -C $(OCFDIR) src O=$(ADAPTERDIR)/ocf @$(MAKE) -C $(OCFDIR) src O=$(ADAPTERDIR)/ocf
@$(MAKE) -C $(OCFDIR) env O=$(ADAPTERDIR)/ocf ENV=posix @$(MAKE) -C $(OCFDIR) env O=$(ADAPTERDIR)/ocf OCF_ENV=posix
clean: clean:
@rm -rf $(OCFLIB) $(OBJS) @rm -rf $(OCFLIB) $(OBJS)