From 1795249adccda89f671ac243681beeb601b7c85a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Wed, 19 Aug 2015 18:46:58 +0200
Subject: Change makefile linux paths to configured Linux source path

Also remove unused buildroot targets
---
 Makefile | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8c58f1f..d1bba9a 100644
--- a/Makefile
+++ b/Makefile
@@ -35,14 +35,18 @@ mbuildroot: buildroot/.config buildroot/system/skeleton/usr/bin/linux-conf-perf
 	$(MAKE) -C buildroot menuconfig
 
 mlinux:
-	ARCH=$(CONF_KERNEL_ARCH) $(MAKE) -C linux menuconfig
+	ARCH=$(CONF_KERNEL_ARCH) $(MAKE) -C $(CONF_LINUX_SOURCES) menuconfig
 
 deflinux:
-	ARCH=$(CONF_KERNEL_ARCH) $(MAKE) -C linux defconfig
+	ARCH=$(CONF_KERNEL_ARCH) $(MAKE) -C $(CONF_LINUX_SOURCES) defconfig
 
 dot_config: allconfig
-	cd linux && SRCARCH=$(CONF_KERNEL_ARCH) ARCH=$(CONF_KERNEL_ARCH) KERNELVERSION=$(CONF_KERNEL_ARCH) \
-		../scripts/allconfig/allconfig Kconfig .config ../$(CONF_DOT_CONFIG)
+	cd $(CONF_LINUX_SOURCES) && \
+		SRCARCH=$(CONF_KERNEL_ARCH) \
+		ARCH=$(CONF_KERNEL_ARCH) \
+		KERNELVERSION=$(CONF_KERNEL_ARCH) \
+		$(CONF_ABSROOT)/scripts/allconfig/allconfig \
+		Kconfig .config $(CONF_ABSROOT)/$(CONF_DOT_CONFIG)
 
 init: initialize
 initialize: all
@@ -82,10 +86,10 @@ clean_database:
 distclean: clean distclean_linux distclean_buildroot clean_measure
 
 clean_linux:
-	@$(MAKE) -C linux clean
+	@$(MAKE) -C $(CONF_LINUX_SOURCES) clean
 
 distclean_linux:
-	@$(MAKE) -C linux distclean
+	@$(MAKE) -C $(CONF_LINUX_SOURCES) distclean
 
 clean_buildroot:
 	@$(MAKE) -C buildroot clean
@@ -115,10 +119,3 @@ picosat:
 	cd scripts/picosat-959 && ./configure; fi
 	@if [ `$(MAKE) -C scripts/picosat-959 -q; echo $$?` != "0" ]; then \
 	$(MAKE) -C scripts/picosat-959; fi
-
-buildroot/.config:
-	cp $(CONF_BUILDROOT_DEF_CONFIG) $@
-
-buildroot/system/skeleton/usr/bin/linux-conf-perf:
-	cp $(CONF_BUILDROOT_INITSCRIPT) $@
-	cat $(CONF_BUILDROOT_INITTAB_DIRECTIVE) >> buildroot/system/skeleton/etc/inittab
-- 
cgit v1.2.3