From e5a5a6319f344969bd28d461cc474f4e3e61fe5d Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Wed, 12 Oct 2016 21:20:24 +0200
Subject: [PATCH] Fixes for lua_exports generation

---
 radio/src/dataconstants.h    |  2 --
 radio/src/lua/CMakeLists.txt | 10 ++++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
index c5cc4651d..8a041be67 100644
--- a/radio/src/dataconstants.h
+++ b/radio/src/dataconstants.h
@@ -21,8 +21,6 @@
 #ifndef _DATACONSTANTS_H_
 #define _DATACONSTANTS_H_
 
-#include "board.h"
-
 #define NUM_STICKS                     4
 
 #if defined(EXPORT)
diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
index c157ff7c0..58ac14522 100644
--- a/radio/src/lua/CMakeLists.txt
+++ b/radio/src/lua/CMakeLists.txt
@@ -5,7 +5,9 @@ endif()
 macro(add_lua_export_target target)
   add_custom_command(
     OUTPUT lua_exports_${target}.inc
-    COMMAND ${CMAKE_C_COMPILER} -E ${ARGN} -DEXPORT ${INTTYPES_INCLUDE_OPTION} ${RADIO_SRC_DIRECTORY}/myeeprom.h | grep LEXP > lua_exports_${target}.txt
+    COMMAND ${CMAKE_C_COMPILER} -E ${ARGN} -DEXPORT ${INTTYPES_INCLUDE_OPTION} ${RADIO_SRC_DIRECTORY}/dataconstants.h > lua_exports_${target}.tmp
+    COMMAND grep LEXP lua_exports_${target}.tmp > lua_exports_${target}.txt
+    COMMAND rm lua_exports_${target}.tmp
     COMMAND python ${RADIO_DIRECTORY}/util/luaexport.py ${VERSION} lua_exports_${target}.txt lua_exports_${target}.inc lua_fields_${target}.txt
   )
   add_custom_target(lua_export_${target} DEPENDS lua_exports_${target}.inc)
@@ -36,6 +38,6 @@ set(LUA_INCLUDES_STM32F4
   -I${RADIO_SRC_DIRECTORY}/${STM32LIB_DIR}/CMSIS/Device/ST/STM32F4xx/Include
   )
 
-add_lua_export_target(taranis     ${LUA_INCLUDES_STM32F2} -DPCBTARANIS           )
-add_lua_export_target(taranis_x9e ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DSTM32F40_41xxx  )
-add_lua_export_target(horus       ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DSTM32F40_41xxx -I${RADIO_SRC_DIRECTORY}/gui/480x272)
+add_lua_export_target(taranis     ${LUA_INCLUDES_STM32F2} -DPCBTARANIS)
+add_lua_export_target(taranis_x9e ${LUA_INCLUDES_STM32F4} -DPCBTARANIS -DPCBX9E -DSTM32F40_41xxx)
+add_lua_export_target(horus       ${LUA_INCLUDES_STM32F4} -DPCBHORUS -DSTM32F40_41xxx)