From: Christian Lamparter <chunkeey@googlemail.com>
Date: Tue, 24 May 2011 22:48:27 +0000 (+0200)
Subject: carl9170 firmware: update build system to accommodate for new cmake config
X-Git-Tag: 1.9.4~7^2~5
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=38a4805625fb6aebf46e7d4b82ea142e873e07c2;p=carl9170fw.git

carl9170 firmware: update build system to accommodate for new cmake config

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51d6265..c017bbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,6 @@ project(carl9170)
 
 include("config.cmake")
 
-file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/generated")
-
 add_subdirectory(carlfw)
 
 if (CONFIG_CARL9170FW_BUILD_MINIBOOT)
diff --git a/autogen.sh b/autogen.sh
index 8a47b51..873fb74 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 case "$1" in
 	config)
 		echo "Configuring..."
+		pushd config
 		cmake .
-		make -C config
+		make
+		popd
 		config/conf Kconfig
+		cmake .
 	;;
 
 	compile)
 		echo "Compile time..."
 		make
-
 	;;
 
 	install)