Merge pull request #45 from mithro/realpath-fix-only

common: realpath is a Makefile builtin.
mithro · Feb 21, 2018 · 3850d8a · 3850d8a
2 parents f46775f + 9a96fa5
commit 3850d8a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/common/make/arch.mk b/common/make/arch.mk
@@ -1,7 +1,7 @@
 
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-XML_DEPS = $(shell realpath $(SELF_DIR)/../../utils/xml_deps.py)
+XML_DEPS = $(realpath $(SELF_DIR)/../../utils/xml_deps.py)
 
 arch.deps.mk: arch.xml $(XML_DEPS) $(SELF_DIR)/arch.mk
 	$(XML_DEPS) $@ $<

diff --git a/common/make/prjxray-clb.mk b/common/make/prjxray-clb.mk
@@ -1,6 +1,6 @@
 
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP_DIR := $(shell realpath $(SELF_DIR)/../../)
+TOP_DIR := $(realpath $(SELF_DIR)/../../)
 
 .SUFFIXES:
 

diff --git a/common/make/prjxray-int.mk b/common/make/prjxray-int.mk
@@ -1,6 +1,6 @@
 
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
-TOP_DIR := $(shell realpath $(SELF_DIR)/../../)
+TOP_DIR := $(realpath $(SELF_DIR)/../../)
 
 .SUFFIXES:
 

diff --git a/common/make/sim.mk b/common/make/sim.mk
@@ -8,14 +8,14 @@ NPM      ?= npm
 
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-NETLISTSVG = $(shell realpath $(SELF_DIR)/../../third_party/netlistsvg)
-NETLISTSVG_STAMP = $(shell realpath $(SELF_DIR)/../../third_party/.netlistsvg.stamp)
+NETLISTSVG = $(realpath $(SELF_DIR)/../../third_party/netlistsvg)
+NETLISTSVG_STAMP = $(realpath $(SELF_DIR)/../../third_party/.netlistsvg.stamp)
 NETLISTSVG_SKIN ?= $(NETLISTSVG)/lib/default.svg
 NETLISTSVG_DPI  ?= 300
 
 YOSYSSVG_DPI  ?= 300
 
-NAME := $(shell echo $(notdir $(shell realpath .)) | tr a-z A-Z)
+NAME := $(shell echo $(notdir $(realpath .)) | tr a-z A-Z)
 
 $(NETLISTSVG_SKIN): $(NETLISTSVG_STAMP)
 	@true

diff --git a/common/make/w.mk b/common/make/w.mk
@@ -1,6 +1,6 @@
 SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
-WPY = $(shell realpath $(SELF_DIR)/../../utils/w.py)
+WPY = $(realpath $(SELF_DIR)/../../utils/w.py)
 
 NAMES := $(foreach W,A B C D,$(NAME_PREFIX)$(W)$(NAME_SUFFIX))