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 51d6265cc9ae48d0acb3ad3fe3f946021acd3cae..c017bbbdbb1d264e6b1730f2b287e1ae3cab24ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,6 @@ project(carl9170)
 
 include("config.cmake")
 
 
 include("config.cmake")
 

-file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/generated")
-

 add_subdirectory(carlfw)
 
 if (CONFIG_CARL9170FW_BUILD_MINIBOOT)
 add_subdirectory(carlfw)
 
 if (CONFIG_CARL9170FW_BUILD_MINIBOOT)

diff --git a/autogen.sh b/autogen.sh
index 8a47b51d57b4b8367e94089a65946c6cc368e466..873fb7490c17739a1d58ad8703a5670cd6011e6c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,19 +1,21 @@
-#!/bin/sh
+#!/bin/bash

 
 set -e
 
 case "$1" in
        config)
                echo "Configuring..."
 
 set -e
 
 case "$1" in
        config)
                echo "Configuring..."

+               pushd config

                cmake .
                cmake .

-               make -C config
+               make
+               popd

                config/conf Kconfig
                config/conf Kconfig

+               cmake .

        ;;
 
        compile)
                echo "Compile time..."
                make
        ;;
 
        compile)
                echo "Compile time..."
                make

-

        ;;
 
        install)
        ;;
 
        install)