jogshuttle: cmake files cleaned up a little bit

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b74ca370779ca311af1f41a9622dfd43193bf370..aedb54d45f982fa46b80cf5bc7b00c3598f1b16f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -295,6 +295,8 @@ include_directories(
   ${KDE4_INCLUDES} # Adds Qt include directories too.
   ${LIBMLT_INCLUDE_DIR}
   ${LIBMLTPLUS_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/external 
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib 
 )
 
 
@@ -320,14 +322,9 @@ target_link_libraries(kdenlive
   ${LIBMLTPLUS_LIBRARY}
   ${CMAKE_DL_LIBS}
   ${CMAKE_THREAD_LIBS_INIT}
+  kiss_fft
 )
 
-if(BUILD_JogShuttle)
-  target_link_libraries(kdenlive
-    ${CMAKE_SOURCE_DIR}/lib/libmedia_ctrl.a
-  )
-endif(BUILD_JogShuttle)
-
 if(Q_WS_X11)
   include_directories(${X11_Xlib_INCLUDE_PATH})
   target_link_libraries(kdenlive ${X11_LIBRARIES})
@@ -368,6 +365,9 @@ endif(BUILD_V4L)
 
 if(BUILD_JogShuttle)
   add_definitions(-DUSE_JOGSHUTTLE)
+  target_link_libraries(kdenlive
+    media_ctrl
+  )
 endif(BUILD_JogShuttle)
 
 install(TARGETS kdenlive DESTINATION ${BIN_INSTALL_DIR})

diff --git a/src/jogshuttle.h b/src/jogshuttle.h
index 2533dcd45f09cb570410c9e34ef5cca89a828d03..36e1f4c8df435725f66149b98a5ea2d1a7ee3940 100644 (file)
--- a/src/jogshuttle.h
+++ b/src/jogshuttle.h
@@ -27,7 +27,7 @@
 
 #include <linux/input.h>
 #include <sys/time.h>
-#include "lib/external/media_ctrl/mediactrl.h"
+#include <media_ctrl/mediactrl.h>
 
 typedef struct input_event EV;
 

diff --git a/src/lib/external/kiss_fft/CMakeLists.txt b/src/lib/external/kiss_fft/CMakeLists.txt
index eff1f9b76cefa8124a62537f68db69d4b0fedca4..e74453f833f144ef5ba9c6dbac4bec3203a3692b 100644 (file)
--- a/src/lib/external/kiss_fft/CMakeLists.txt
+++ b/src/lib/external/kiss_fft/CMakeLists.txt
@@ -1,14 +1,4 @@
-set(kdenlive_SRCS
-  ${kdenlive_SRCS}
-  lib/external/kiss_fft/_kiss_fft_guts.h
-  lib/external/kiss_fft/kiss_fft.c
-  lib/external/kiss_fft/tools/kiss_fftr.c
-  PARENT_SCOPE
-)
-
-
 # Create a static library from kiss_fft
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99")
 include_directories(
   ${CMAKE_BINARY_DIR}