bcc-lua: build bcc.lua and bcc.o in the build tree

diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt
index 9cf6345..b9b4138 100644 (file)
--- a/src/lua/CMakeLists.txt
+++ b/src/lua/CMakeLists.txt
@@ -5,21 +5,19 @@ if (LUAJIT_LIBRARIES)
        FILE(GLOB_RECURSE SRC_LUA ${CMAKE_CURRENT_SOURCE_DIR}/bcc/*/*.lua)
 
        ADD_CUSTOM_COMMAND(
-               OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/bcc.lua
-               COMMAND ${LUAJIT} src/squish.lua
+               OUTPUT bcc.lua
+               COMMAND ${LUAJIT} ${CMAKE_CURRENT_SOURCE_DIR}/src/squish.lua ${CMAKE_CURRENT_SOURCE_DIR}
                DEPENDS ${SRC_LUA} ${CMAKE_CURRENT_SOURCE_DIR}/squishy
-               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
        )
 
        ADD_CUSTOM_COMMAND(
-               OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/bcc.o
-               COMMAND ${LUAJIT} -bg src/bcc.lua src/bcc.o
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/bcc.lua
-               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+               OUTPUT bcc.o
+               COMMAND ${LUAJIT} -bg bcc.lua bcc.o
+               DEPENDS bcc.lua
        )
 
        include_directories(${LUAJIT_INCLUDE_DIR})
-       add_executable(bcc-lua src/main.c src/bcc.o)
+       add_executable(bcc-lua src/main.c bcc.o)
        target_link_libraries(bcc-lua ${LUAJIT_LIBRARIES})
 
        install(TARGETS bcc-lua RUNTIME DESTINATION bin)

diff --git a/src/lua/squishy b/src/lua/squishy
index cd84771..366fa42 100644 (file)
--- a/src/lua/squishy
+++ b/src/lua/squishy
@@ -14,4 +14,4 @@ Module "bcc.table" "bcc/table.lua"
 Module "bcc.ld" "bcc/ld.lua"
 
 Main "bcc/run.lua"
-Output "src/bcc.lua"
+Output "bcc.lua"