use absolute paths in Makefiles

Use _ABS in Makefiles wherever possible. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

use absolute paths in Makefiles
Use _ABS in Makefiles wherever possible. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
eeb0a7e4 · Adam Wujek · 31d83855 · eeb0a7e4 · eeb0a7e4 · eeb0a7e4
Commit eeb0a7e4 authored Oct 27, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 20 deletions

Makefile Makefile +12 -15

Makefile kernel/Makefile +3 -3

Makefile lib/Makefile +3 -2

No files found.
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,6 @@ FMC_BUS ?= $(shell pwd)/fmc-bus
 ZIO ?= $(shell pwd)/zio
 SPEC_SW ?= $(shell pwd)/spec-sw
-export FMC_BUS
-export ZIO
-export SPEC_SW
 # FMC_BUS_ABS, ZIO_ABS and SPEC_SW_ABS has to be absolut path, due to beeing
 # passed to the Kbuild
 FMC_BUS_ABS ?= $(abspath $(FMC_BUS) )
@@ -27,15 +24,15 @@ export FMC_BUS_ABS
 export ZIO_ABS
 export SPEC_SW_ABS
-ZIO_VERSION = $(shell cd $(ZIO); git describe --always --dirty --long --tags)
+ZIO_VERSION = $(shell cd $(ZIO_ABS); git describe --always --dirty --long --tags)
 export ZIO_VERSION
-DIRS = $(FMC_BUS) $(ZIO) $(SPEC_SW) kernel lib tools
+DIRS = $(FMC_BUS_ABS) $(ZIO_ABS) $(SPEC_SW_ABS) kernel lib tools
-$(SPEC_SW): $(FMC_BUS)
+$(SPEC_SW_ABS): $(FMC_BUS_ABS)
-kernel: $(FMC_BUS) $(ZIO) $(SPEC_SW)
+kernel: $(FMC_BUS_ABS) $(ZIO_ABS) $(SPEC_SW_ABS)
-lib: $(ZIO)
+lib: $(ZIO_ABS)
 tools: lib
 .PHONY: all clean modules install modules_install $(DIRS)
@@ -55,7 +52,7 @@ $(DIRS):
 	$(MAKE) -C $@ $(TARGET)
-SUBMOD = $(FMC_BUS) $(ZIO) $(SPEC_SW)
+SUBMOD = $(FMC_BUS_ABS) $(ZIO_ABS) $(SPEC_SW_ABS)
 prereq_install_warn:
 	@test -f .prereq_installed || \
@@ -65,18 +62,18 @@ prereq_install:
 	for d in $(SUBMOD); do $(MAKE) -C $$d modules_install || exit 1; done
 	touch .prereq_installed
-$(FMC_BUS): fmc-bus-init_repo
+$(FMC_BUS_ABS): fmc-bus-init_repo
-$(ZIO): zio-init_repo
+$(ZIO_ABS): zio-init_repo
-$(SPEC_SW): spec-sw-init_repo
+$(SPEC_SW_ABS): spec-sw-init_repo
 # init submodule if missing
 fmc-bus-init_repo:
-	@test -d $(FMC_BUS)/doc || ( echo "Checking out submodule $(FMC_BUS)"; git submodule update --init $(FMC_BUS) )
+	@test -d $(FMC_BUS_ABS)/doc || ( echo "Checking out submodule $(FMC_BUS_ABS)"; git submodule update --init $(FMC_BUS_ABS) )
 # init submodule if missing
 zio-init_repo:
-	@test -d $(ZIO)/doc || ( echo "Checking out submodule $(ZIO)" && git submodule update --init $(ZIO) )
+	@test -d $(ZIO_ABS)/doc || ( echo "Checking out submodule $(ZIO_ABS)" && git submodule update --init $(ZIO_ABS) )
 # init submodule if missing
 spec-sw-init_repo:
-	@test -d $(SPEC_SW)/doc || ( echo "Checking out submodule $(SPEC_SW)" && git submodule update --init $(SPEC_SW) )
+	@test -d $(SPEC_SW_ABS)/doc || ( echo "Checking out submodule $(SPEC_SW_ABS)" && git submodule update --init $(SPEC_SW_ABS) )
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -5,9 +5,9 @@ REPO_PARENT=$(shell /bin/pwd)/../..
 LINUX ?= /lib/modules/$(shell uname -r)/build
-FMC_BUS ?= $(shell pwd)/../fmc-bus
+FMC_BUS ?= ../fmc-bus
-ZIO ?= $(shell pwd)/../zio
+ZIO ?= ../zio
-SPEC_SW ?= $(shell pwd)/../spec-sw
+SPEC_SW ?= ../spec-sw
 # FMC_BUS_ABS, ZIO_ABS and SPEC_SW_ABS has to be absolut path, due to beeing
 # passed to the Kbuild

--- a/lib/Makefile
+++ b/lib/Makefile
@@ -8,14 +8,15 @@
 # include parent_common.mk for buildsystem's defines
 REPO_PARENT=../..
 -include $(REPO_PARENT)/parent_common.mk
-#ZIO := $(shell ../scripts/check-submodule zio $(ZIO))
 ZIO ?= ../zio
+ZIO_ABS ?= $(abspath $(ZIO) )
 LIB = libfmctdc.a
 LOBJ := fmctdc-lib.o
 LOBJ += fmctdc-lib-math.o
-CFLAGS = -Wall -ggdb -O2 -I../kernel -I$(ZIO)/include $(EXTRACFLAGS)
+CFLAGS = -Wall -ggdb -O2 -I../kernel -I$(ZIO_ABS)/include $(EXTRACFLAGS)
 DESTDIR ?= /usr/local