Reorganize and cleanup build structure

src/CMakeLists.txt gets splitted in several files; #include's are now
relative to src/ (or, when in one of its direct sub directories, on
it).

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d7b2b3d8b6cd905ad6dcbab360fe610cb1c00c0..200cc422df579c80c0b588020c9fe4d7cb4aa202 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,15 +1,32 @@
+macro_optional_find_package(Nepomuk)
+macro_optional_find_package(QJSON)
+
+add_subdirectory(audioscopes)
 add_subdirectory(beziercurve)
+add_subdirectory(blackmagic)
 add_subdirectory(colorcorrection)
+add_subdirectory(colorscopes)
+add_subdirectory(commands)
+add_subdirectory(databackup)
 add_subdirectory(kiss_fft)
 add_subdirectory(mimetypes)
 add_subdirectory(onmonitoritems)
-add_subdirectory(rotoscoping)
-add_subdirectory(widgets)
-add_subdirectory(databackup)
-add_subdirectory(commands)
+add_subdirectory(simplekeyframes)
+add_subdirectory(stopmotion)
 
-macro_optional_find_package(Nepomuk)
-macro_optional_find_package(QJSON)
+if(QJSON_FOUND)
+  add_subdirectory(rotoscoping)
+  add_subdirectory(onmonitoritems/rotoscoping)
+  include_directories(QJSON_INCLUDE_DIR)
+  set(optional_libs ${optional_libs} ${QJSON_LIBRARIES})
+  add_definitions(-DQJSON)
+else(QJSON_FOUND)
+  message(STATUS "Install QJson to use the rotoscoping filter")
+endif(QJSON_FOUND)
+
+if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD")
+  add_subdirectory(v4l)
+endif(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD")
 
 include_directories(
   ${KDE4_INCLUDE_DIR}
@@ -18,32 +35,16 @@ include_directories(
   ${LIBMLT_INCLUDE_DIR}
   ${LIBMLTPLUS_INCLUDE_DIR}
   ${QDBUS_INCLUDE_DIRS}
-  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/audioscopes
-  ${CMAKE_SOURCE_DIR}/src/beziercurve
-  ${CMAKE_SOURCE_DIR}/src/colorcorrection
-  ${CMAKE_SOURCE_DIR}/src/kiss_fft
-  ${CMAKE_SOURCE_DIR}/src/onmonitoritems
-  ${CMAKE_SOURCE_DIR}/src/onmonitoritems/rotoscoping
-  ${CMAKE_SOURCE_DIR}/src/widgets
 )
 
-
 if(Nepomuk_FOUND)
   include_directories(NEPOMUK_INCLUDES)
-  set(optional_libs ${NEPOMUK_LIBRARIES})
+  set(optional_libs ${optional_libs} ${NEPOMUK_LIBRARIES})
   add_definitions(-DNEPOMUK)
 endif(Nepomuk_FOUND)
 
-if(QJSON_FOUND)
-  include_directories(QJSON_INCLUDE_DIR)
-  set(optional_libs ${optional_libs} ${QJSON_LIBRARIES})
-  add_definitions(-DQJSON)
-else(QJSON_FOUND)
-  message(STATUS "Install QJson to use the rotoscoping filter")
-endif(QJSON_FOUND)
-
 if(Q_WS_X11)
   include_directories(${X11_Xlib_INCLUDE_PATH})
 endif(Q_WS_X11)
@@ -203,44 +204,17 @@ set(kdenlive_SRCS
   timecodedisplay.cpp
   tracksconfigdialog.cpp
   abstractscopewidget.cpp
-  audioscopes/abstractaudioscopewidget.cpp
-  audioscopes/audiospectrum.cpp
-  audioscopes/spectrogram.cpp
-  audioscopes/ffttools.cpp
-  colorscopes/abstractgfxscopewidget.cpp
-  colorscopes/histogram.cpp
-  colorscopes/rgbparade.cpp
-  colorscopes/vectorscope.cpp
-  colorscopes/waveform.cpp
   colorplaneexport.cpp
   colortools.cpp
-  colorcorrection/histogramgenerator.cpp
-  colorcorrection/rgbparadegenerator.cpp
-  colorcorrection/vectorscopegenerator.cpp
-  colorcorrection/waveformgenerator.cpp
   colorpickerwidget.cpp
   choosecolorwidget.cpp
   monitorscene.cpp
   geometrywidget.cpp
   doubleparameterwidget.cpp
   audiosignal.cpp
-  blackmagic/include/DeckLinkAPIDispatch.cpp
-  stopmotion/stopmotion.cpp
-  blackmagic/devices.cpp
-  onmonitoritems/onmonitorrectitem.cpp
-  onmonitoritems/onmonitorcornersitem.cpp
   cornerswidget.cpp
-  kiss_fft/_kiss_fft_guts.h
-  kiss_fft/kiss_fft.c
-  kiss_fft/tools/kiss_fftr.c
-  beziercurve/beziersplineeditor.cpp
-  beziercurve/beziersplinewidget.cpp
-  beziercurve/bpoint.cpp
-  beziercurve/cubicbezierspline.cpp
   dragvalue.cpp
   monitoreditwidget.cpp
-  simplekeyframes/simpletimelinewidget.cpp
-  simplekeyframes/simplekeyframewidget.cpp
   noteswidget.cpp
   archivewidget.cpp
   mltdevicecapture.cpp
@@ -265,24 +239,6 @@ if(APPLE OR OPENGL_FOUND)
   set(kdenlive_SRCS videoglwidget.cpp ${kdenlive_SRCS})
 endif(APPLE OR OPENGL_FOUND)
 
-if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD")
-  set(kdenlive_SRCS
-    ${kdenlive_SRCS}
-    v4l/v4lcapture.cpp
-    v4l/src.c
-  )
-endif(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD")
-
-if(QJSON_FOUND)
-  set(kdenlive_SRCS
-    ${kdenlive_SRCS}
-    onmonitoritems/rotoscoping/bpointitem.cpp
-    onmonitoritems/rotoscoping/nearestpoint.cpp
-    onmonitoritems/rotoscoping/splineitem.cpp
-    rotoscoping/rotowidget.cpp
-  )
-endif(QJSON_FOUND)
-
 # Add libdl
 find_library(DL_LIB NAMES ${CMAKE_DL_LIBS})
 message(STATUS "using dl library: ${DL_LIB}")

diff --git a/src/abstractscopewidget.cpp b/src/abstractscopewidget.cpp
index 022063d31a9e44580c9b9150c2ffe53ab518bfba..0622bd97d72c0f325a3fc05b1ad50ead09dc6076 100644 (file)
--- a/src/abstractscopewidget.cpp
+++ b/src/abstractscopewidget.cpp
@@ -8,12 +8,11 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "qtconcurrentrun.h"
-
 #include "abstractscopewidget.h"
 #include "renderer.h"
 #include "monitor.h"
 
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QColor>
 #include <QMenu>

diff --git a/src/audioscopes/CMakeLists.txt b/src/audioscopes/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7b8ef2bdf6b8d2e8113dc3d34d771222a3aeeca4 100644 (file)
--- a/src/audioscopes/CMakeLists.txt
+++ b/src/audioscopes/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  audioscopes/abstractaudioscopewidget.cpp
+  audioscopes/audiospectrum.cpp
+  audioscopes/ffttools.cpp
+  audioscopes/spectrogram.cpp
+  PARENT_SCOPE
+)

diff --git a/src/audioscopes/abstractaudioscopewidget.cpp b/src/audioscopes/abstractaudioscopewidget.cpp
index 099a8e6e955b8b6565c3ebf8c49393dfe573884c..16b50681b4abb8ba6e8bd359e521346aa2ea2ef7 100644 (file)
--- a/src/audioscopes/abstractaudioscopewidget.cpp
+++ b/src/audioscopes/abstractaudioscopewidget.cpp
@@ -8,12 +8,11 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "qtconcurrentrun.h"
-
 #include "abstractaudioscopewidget.h"
 #include "renderer.h"
 #include "monitor.h"
 
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QColor>
 #include <QMenu>

diff --git a/src/audioscopes/audiospectrum.cpp b/src/audioscopes/audiospectrum.cpp
index eeb6a53a0577ff0feb121301cd01596171174ead..be40af7ab57504fbc284be771bf794958a02b588 100644 (file)
--- a/src/audioscopes/audiospectrum.cpp
+++ b/src/audioscopes/audiospectrum.cpp
@@ -12,7 +12,7 @@
 
 #include "audiospectrum.h"
 #include "ffttools.h"
-#include "tools/kiss_fftr.h"
+#include "kiss_fft/tools/kiss_fftr.h"
 
 #include <QMenu>
 #include <QPainter>

diff --git a/src/audioscopes/audiospectrum.h b/src/audioscopes/audiospectrum.h
index 3f486c24102138f085f9c9d16aa55abf9a95e4c8..77308afa98e21f50cb1fb208ed708c9c39694c81 100644 (file)
--- a/src/audioscopes/audiospectrum.h
+++ b/src/audioscopes/audiospectrum.h
@@ -29,7 +29,7 @@
 
 #include "abstractaudioscopewidget.h"
 #include "ui_audiospectrum_ui.h"
-#include "tools/kiss_fftr.h"
+#include "kiss_fft/tools/kiss_fftr.h"
 #include "ffttools.h"
 
 class AudioSpectrum_UI;

diff --git a/src/audioscopes/ffttools.h b/src/audioscopes/ffttools.h
index f71d04aada5e5dace6fdb2dd9e508f7e273cfa86..26cee848288bfcca5015de29da86389d50bc8182 100644 (file)
--- a/src/audioscopes/ffttools.h
+++ b/src/audioscopes/ffttools.h
@@ -13,7 +13,7 @@
 
 #include <QVector>
 #include <QHash>
-#include <tools/kiss_fftr.h>
+#include "kiss_fft/tools/kiss_fftr.h"
 
 class FFTTools
 {

diff --git a/src/audiosignal.cpp b/src/audiosignal.cpp
index 30471e0bf288b078a183cf2406e3d6a567d647dd..6ccd2dd5ea30e0b627a30f5da3372b47e055854c 100644 (file)
--- a/src/audiosignal.cpp
+++ b/src/audiosignal.cpp
@@ -18,7 +18,6 @@
  ***************************************************************************/
 
 #include "audiosignal.h"
-#include "math.h"
 
 #include <KLocale>
 
@@ -29,6 +28,7 @@
 #include <QDebug>
 #include <QList>
 
+#include <math.h>
 
 AudioSignal::AudioSignal(QWidget *parent): QWidget(parent)
 {

diff --git a/src/beziercurve/CMakeLists.txt b/src/beziercurve/CMakeLists.txt
index 8b137891791fe96927ad78e64b0aad7bded08bdc..625b4044df932ea0bed15584ae8df8e3184d00d3 100644 (file)
--- a/src/beziercurve/CMakeLists.txt
+++ b/src/beziercurve/CMakeLists.txt
@@ -1 +1,8 @@
-
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  beziercurve/beziersplineeditor.cpp
+  beziercurve/beziersplinewidget.cpp
+  beziercurve/bpoint.cpp
+  beziercurve/cubicbezierspline.cpp
+  PARENT_SCOPE
+)

diff --git a/src/blackmagic/CMakeLists.txt b/src/blackmagic/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5bb17a9
--- /dev/null
+++ b/src/blackmagic/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  blackmagic/devices.cpp
+  blackmagic/include/DeckLinkAPIDispatch.cpp
+  PARENT_SCOPE
+)

diff --git a/src/colorcorrection/CMakeLists.txt b/src/colorcorrection/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..78d0fd1019daa0dc0ac8439830ad15d7529cb787 100644 (file)
--- a/src/colorcorrection/CMakeLists.txt
+++ b/src/colorcorrection/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  colorcorrection/histogramgenerator.cpp
+  colorcorrection/rgbparadegenerator.cpp
+  colorcorrection/vectorscopegenerator.cpp
+  colorcorrection/waveformgenerator.cpp
+  PARENT_SCOPE
+)

diff --git a/src/colorscopes/CMakeLists.txt b/src/colorscopes/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d2df8d0
--- /dev/null
+++ b/src/colorscopes/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  colorscopes/abstractgfxscopewidget.cpp
+  colorscopes/histogram.cpp
+  colorscopes/rgbparade.cpp
+  colorscopes/vectorscope.cpp
+  colorscopes/waveform.cpp
+  PARENT_SCOPE
+)

diff --git a/src/colorscopes/abstractgfxscopewidget.cpp b/src/colorscopes/abstractgfxscopewidget.cpp
index 370fcb0d173f8860817a18f3d876606cb096b797..94f90400a6bba3052219f05412a2269388d35a42 100644 (file)
--- a/src/colorscopes/abstractgfxscopewidget.cpp
+++ b/src/colorscopes/abstractgfxscopewidget.cpp
@@ -8,12 +8,11 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include "qtconcurrentrun.h"
-
 #include "abstractgfxscopewidget.h"
 #include "renderer.h"
 #include "monitormanager.h"
 
+#include <QtConcurrentRun>
 #include <QFuture>
 #include <QColor>
 #include <QMenu>

diff --git a/src/colorscopes/histogram.cpp b/src/colorscopes/histogram.cpp
index 9fd9ee8eab7351650671a81bdf742aa590db8b94..9b5915a5bc9f64400a1105503f48ebb7d4498bba 100644 (file)
--- a/src/colorscopes/histogram.cpp
+++ b/src/colorscopes/histogram.cpp
@@ -10,7 +10,7 @@
 
 #include <QMenu>
 #include <QTime>
-#include "histogramgenerator.h"
+#include "colorcorrection/histogramgenerator.h"
 #include "histogram.h"
 #include "renderer.h"
 

diff --git a/src/colorscopes/rgbparade.cpp b/src/colorscopes/rgbparade.cpp
index 396697fcea6a1dfdd594950724983736ea70b221..18be787a095a4cc79d373efa6ea9d193e50168e2 100644 (file)
--- a/src/colorscopes/rgbparade.cpp
+++ b/src/colorscopes/rgbparade.cpp
@@ -14,7 +14,7 @@
 #include <QTime>
 #include "renderer.h"
 #include "rgbparade.h"
-#include "rgbparadegenerator.h"
+#include "colorcorrection/rgbparadegenerator.h"
 
 RGBParade::RGBParade(MonitorManager *manager, QWidget *parent) :
         AbstractGfxScopeWidget(manager, true, parent)

diff --git a/src/colorscopes/vectorscope.cpp b/src/colorscopes/vectorscope.cpp
index fc98f1c78f0f50c6940574a0ee293750792b9ccb..76a6e72226227078ded5468f5541ad6a3ff93ec2 100644 (file)
--- a/src/colorscopes/vectorscope.cpp
+++ b/src/colorscopes/vectorscope.cpp
@@ -22,7 +22,7 @@
 #include "colortools.h"
 #include "renderer.h"
 #include "vectorscope.h"
-#include "vectorscopegenerator.h"
+#include "colorcorrection/vectorscopegenerator.h"
 
 const float P75 = .75;
 const unsigned char DEFAULT_Y = 255;

diff --git a/src/colorscopes/waveform.cpp b/src/colorscopes/waveform.cpp
index bf09234bfeb9174ec7c3ae645539629879e11d65..f8fec8b1493d450c6802013d00e7592f3726595d 100644 (file)
--- a/src/colorscopes/waveform.cpp
+++ b/src/colorscopes/waveform.cpp
@@ -19,7 +19,7 @@
 
 #include "renderer.h"
 #include "waveform.h"
-#include "waveformgenerator.h"
+#include "colorcorrection/waveformgenerator.h"
 
 
 const QSize Waveform::m_textWidth(35,0);

diff --git a/src/commands/addclipcommand.cpp b/src/commands/addclipcommand.cpp
index 5e15f6c374a5ca6301c2bb135d7684c23f936b95..44df4d5b11c9f57ef593ceb3bc7ba7a919f3773a 100644 (file)
--- a/src/commands/addclipcommand.cpp
+++ b/src/commands/addclipcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/addclipcommand.h"
+#include "addclipcommand.h"
 #include "kdenlivedoc.h"
 
 #include <KLocale>

diff --git a/src/commands/addclipcutcommand.cpp b/src/commands/addclipcutcommand.cpp
index 3dbca2343e2274390426293f77c771241a56047f..d5bf0829e9a1ebdb014e20a098256ba5e9c1a038 100644 (file)
--- a/src/commands/addclipcutcommand.cpp
+++ b/src/commands/addclipcutcommand.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "commands/addclipcutcommand.h"
+#include "addclipcutcommand.h"
 #include "projectlist.h"
 
 #include <KLocale>

diff --git a/src/commands/addeffectcommand.cpp b/src/commands/addeffectcommand.cpp
index c7c92c6961727708b5481e4b9db0cd47f7e2025b..5e09957c7890a8f253eabfeee1b16773dcb6bc48 100644 (file)
--- a/src/commands/addeffectcommand.cpp
+++ b/src/commands/addeffectcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/addeffectcommand.h"
+#include "addeffectcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/addfoldercommand.cpp b/src/commands/addfoldercommand.cpp
index b481ec0abdbec36357b8fd8951f31d53bbdd8251..b5146d96419243f6b460f1069d4a713c5132fe1a 100644 (file)
--- a/src/commands/addfoldercommand.cpp
+++ b/src/commands/addfoldercommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/addfoldercommand.h"
+#include "addfoldercommand.h"
 #include "projectlist.h"
 
 #include <KLocale>

diff --git a/src/commands/addmarkercommand.cpp b/src/commands/addmarkercommand.cpp
index 3d671e59f439fae5cd8edc1b05919c3e22654a33..bc6d73207d874b55f167ede86b9f01a4b3b1a52c 100644 (file)
--- a/src/commands/addmarkercommand.cpp
+++ b/src/commands/addmarkercommand.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include "commands/addmarkercommand.h"
+#include "addmarkercommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/addtimelineclipcommand.cpp b/src/commands/addtimelineclipcommand.cpp
index 3a790462f5cefced4dfe427dde3678c5a1077577..3a13ad54dc26844641b578695153a695a62e0379 100644 (file)
--- a/src/commands/addtimelineclipcommand.cpp
+++ b/src/commands/addtimelineclipcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/addtimelineclipcommand.h"
+#include "addtimelineclipcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/addtrackcommand.cpp b/src/commands/addtrackcommand.cpp
index 962f018b6987ad7033dc4711a80c97e67a1413a2..fa8b5692ea5f44f2a9cf2e298c2622374ecba366 100644 (file)
--- a/src/commands/addtrackcommand.cpp
+++ b/src/commands/addtrackcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/addtrackcommand.h"
+#include "addtrackcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/addtransitioncommand.cpp b/src/commands/addtransitioncommand.cpp
index 2e44de91f21454e0ace1b32c1b660647c46f7073..c8acc6dc8aa30ae13a58752a3dfda588e47289f0 100644 (file)
--- a/src/commands/addtransitioncommand.cpp
+++ b/src/commands/addtransitioncommand.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include "commands/addtransitioncommand.h"
+#include "addtransitioncommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/changecliptypecommand.cpp b/src/commands/changecliptypecommand.cpp
index ea539f070142cdbabcc06f9fa8f75056879a1c8e..5df821af5b401eb1b33c6342df45d2ad1008b7d5 100644 (file)
--- a/src/commands/changecliptypecommand.cpp
+++ b/src/commands/changecliptypecommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/changecliptypecommand.h"
+#include "changecliptypecommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/changespeedcommand.cpp b/src/commands/changespeedcommand.cpp
index d671a874b037b1fc56d87f7e0619088a40b04f33..f775c6813c24e0afdd9f211ec319fae0c77c7571 100644 (file)
--- a/src/commands/changespeedcommand.cpp
+++ b/src/commands/changespeedcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/changespeedcommand.h"
+#include "changespeedcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/configtrackscommand.cpp b/src/commands/configtrackscommand.cpp
index 18e5c123eb86da594d352454c17a9e50f219e52d..f034eddedc5a8edca8c457487a9df6defd92b15d 100644 (file)
--- a/src/commands/configtrackscommand.cpp
+++ b/src/commands/configtrackscommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/configtrackscommand.h"
+#include "configtrackscommand.h"
 #include "customtrackview.h"
 
 

diff --git a/src/commands/editclipcommand.cpp b/src/commands/editclipcommand.cpp
index ecbc3f6b7ad79cec0af390bfdfd50913a381a5e5..d65acfc509794290fdf2e8d860887cae2c5e1d40 100644 (file)
--- a/src/commands/editclipcommand.cpp
+++ b/src/commands/editclipcommand.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "commands/editclipcommand.h"
+#include "editclipcommand.h"
 #include "projectlist.h"
 
 #include <KLocale>

diff --git a/src/commands/editclipcutcommand.cpp b/src/commands/editclipcutcommand.cpp
index ecc07d49717f2cbde67c1f07240d60c129ba1873..b6708f81c3549c00743765f25468e6b1907c948f 100644 (file)
--- a/src/commands/editclipcutcommand.cpp
+++ b/src/commands/editclipcutcommand.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "commands/editclipcutcommand.h"
+#include "editclipcutcommand.h"
 #include "projectlist.h"
 
 #include <KLocale>

diff --git a/src/commands/editeffectcommand.cpp b/src/commands/editeffectcommand.cpp
index 5c2e9ae8432f5192fd19d142edd28771f4488332..b6a98145f2c0ab8605a3a859edafd30e5e9519b6 100644 (file)
--- a/src/commands/editeffectcommand.cpp
+++ b/src/commands/editeffectcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/editeffectcommand.h"
+#include "editeffectcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/editfoldercommand.cpp b/src/commands/editfoldercommand.cpp
index 6e15c8c5462ee55d31c8bc88dd4682cf82d1bc35..6dbcd7fc95b343118c2a071d05f19dbaceee1ac4 100644 (file)
--- a/src/commands/editfoldercommand.cpp
+++ b/src/commands/editfoldercommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/editfoldercommand.h"
+#include "editfoldercommand.h"
 #include "projectlist.h"
 
 #include <KLocale>

diff --git a/src/commands/editguidecommand.cpp b/src/commands/editguidecommand.cpp
index b5f837fe438e9e6c9243562f6c62f728dfad2eda..20933a3c8e760fe06e0b7b04b4e8cdd7cd765ae5 100644 (file)
--- a/src/commands/editguidecommand.cpp
+++ b/src/commands/editguidecommand.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include "commands/editguidecommand.h"
+#include "editguidecommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/editkeyframecommand.cpp b/src/commands/editkeyframecommand.cpp
index 19e9753c00a61f4cc2754936e8b4c4861bbb5aa2..29c341ca24e47991373dbe0f55cd9c5ef2dd760a 100644 (file)
--- a/src/commands/editkeyframecommand.cpp
+++ b/src/commands/editkeyframecommand.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include "commands/editkeyframecommand.h"
+#include "editkeyframecommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/edittransitioncommand.cpp b/src/commands/edittransitioncommand.cpp
index 6ba38a1dfbe2f47ec75e5bf0699932c8bfcda01b..dd3afe7da269871f6e9001db0b3e11bc10a7e43a 100644 (file)
--- a/src/commands/edittransitioncommand.cpp
+++ b/src/commands/edittransitioncommand.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "commands/edittransitioncommand.h"
+#include "edittransitioncommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/groupclipscommand.cpp b/src/commands/groupclipscommand.cpp
index c7a5d7d23a8a1dc1061d6487070fa2bd4d4da371..77010c16c763eb2ffbd697695a416c45c641278e 100644 (file)
--- a/src/commands/groupclipscommand.cpp
+++ b/src/commands/groupclipscommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/groupclipscommand.h"
+#include "groupclipscommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/insertspacecommand.cpp b/src/commands/insertspacecommand.cpp
index 7a485fd3544ad44b8be7496f705179d2bee6c3bd..7802a82b44e8bda170f6228cc0a95ab54b84ee59 100644 (file)
--- a/src/commands/insertspacecommand.cpp
+++ b/src/commands/insertspacecommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/insertspacecommand.h"
+#include "insertspacecommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/locktrackcommand.cpp b/src/commands/locktrackcommand.cpp
index be5c31fb0d4c868a120c42af2238af7ef0168566..8b35773bc56960a950afd1d56cbce4f00325d25e 100644 (file)
--- a/src/commands/locktrackcommand.cpp
+++ b/src/commands/locktrackcommand.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include "commands/locktrackcommand.h"
+#include "locktrackcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/moveclipcommand.cpp b/src/commands/moveclipcommand.cpp
index aa1457510efb74776338d1dab53a2d7cda0f184e..659c09faad669e31687fc9f1ad0a0f6dbeb88828 100644 (file)
--- a/src/commands/moveclipcommand.cpp
+++ b/src/commands/moveclipcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/moveclipcommand.h"
+#include "moveclipcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/moveeffectcommand.cpp b/src/commands/moveeffectcommand.cpp
index 5c756ed92f122443180313759bb62d2563eed6d7..ba87dc3ddcb54ef9a25066f49376606a0f6de10d 100644 (file)
--- a/src/commands/moveeffectcommand.cpp
+++ b/src/commands/moveeffectcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/moveeffectcommand.h"
+#include "moveeffectcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/movegroupcommand.cpp b/src/commands/movegroupcommand.cpp
index f4b467c62c7139e0c5c6d4651a1c5bfe44580369..f22bdc95818546294e1462cb3eebf4de8a623e16 100644 (file)
--- a/src/commands/movegroupcommand.cpp
+++ b/src/commands/movegroupcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/movegroupcommand.h"
+#include "movegroupcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/movetransitioncommand.cpp b/src/commands/movetransitioncommand.cpp
index 9363a0e0d295fad59de7fd09d0d7c34a14a55fae..f825ed77c8b7cd987a52483b42402943baf2090a 100644 (file)
--- a/src/commands/movetransitioncommand.cpp
+++ b/src/commands/movetransitioncommand.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "commands/movetransitioncommand.h"
+#include "movetransitioncommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/razorclipcommand.cpp b/src/commands/razorclipcommand.cpp
index d3b8a5cd44ad510c799de50d3ea0de77df3ad398..023f39f8c7ab8d33253aa4d52c80bf012ff3e696 100644 (file)
--- a/src/commands/razorclipcommand.cpp
+++ b/src/commands/razorclipcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/razorclipcommand.h"
+#include "razorclipcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/razorgroupcommand.cpp b/src/commands/razorgroupcommand.cpp
index c918df72a9183a9e65b6e1b1a03a97cb39cf7de3..e419761bb8c60b1f2658bb1bda2649c898f845df 100644 (file)
--- a/src/commands/razorgroupcommand.cpp
+++ b/src/commands/razorgroupcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/razorgroupcommand.h"
+#include "razorgroupcommand.h"
 #include "customtrackview.h"
 
 RazorGroupCommand::RazorGroupCommand(CustomTrackView *view, QList <ItemInfo> clips1, QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime cutPos, QUndoCommand * parent) :

diff --git a/src/commands/rebuildgroupcommand.cpp b/src/commands/rebuildgroupcommand.cpp
index 892b614db640c14229b5f1e25accee833072f989..69a276cb7c6eda779cdfcf1ab0b44a34205eed34 100644 (file)
--- a/src/commands/rebuildgroupcommand.cpp
+++ b/src/commands/rebuildgroupcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/rebuildgroupcommand.h"
+#include "rebuildgroupcommand.h"
 #include "customtrackview.h"
 
 RebuildGroupCommand::RebuildGroupCommand(CustomTrackView* view, int childTrack, GenTime childPos, QUndoCommand* parent) :

diff --git a/src/commands/resizeclipcommand.cpp b/src/commands/resizeclipcommand.cpp
index ca0689dee352260ec0e3e5e77ca36b3451838b28..9cde2c4bf7a16e5c2b35f253d1280c11559e0996 100644 (file)
--- a/src/commands/resizeclipcommand.cpp
+++ b/src/commands/resizeclipcommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/resizeclipcommand.h"
+#include "resizeclipcommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/commands/splitaudiocommand.cpp b/src/commands/splitaudiocommand.cpp
index cb955989908312fcc71cf7cb5d4bcff2301631cb..cfe3aef0fc307038e9cd1aae8647adad56e6f7ca 100644 (file)
--- a/src/commands/splitaudiocommand.cpp
+++ b/src/commands/splitaudiocommand.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "commands/splitaudiocommand.h"
+#include "splitaudiocommand.h"
 #include "customtrackview.h"
 
 #include <KLocale>

diff --git a/src/kiss_fft/CMakeLists.txt b/src/kiss_fft/CMakeLists.txt
index f7c6b56eb7ad42d6fee07531adb23a0ac15c6a42..51288bf59cd03cb09d4ba00af8a56a2f268ec14e 100644 (file)
--- a/src/kiss_fft/CMakeLists.txt
+++ b/src/kiss_fft/CMakeLists.txt
@@ -1 +1,7 @@
-add_subdirectory(tools)
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  kiss_fft/_kiss_fft_guts.h
+  kiss_fft/kiss_fft.c
+  kiss_fft/tools/kiss_fftr.c
+  PARENT_SCOPE
+)

diff --git a/src/kiss_fft/tools/CMakeLists.txt b/src/kiss_fft/tools/CMakeLists.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/kiss_fft/tools/fftutil.c b/src/kiss_fft/tools/fftutil.c
index db5a81512113dd1ba7ab329493e4584c2b5010d4..0459227973d84d4fdcf33dac57b0f0aded3588dd 100644 (file)
--- a/src/kiss_fft/tools/fftutil.c
+++ b/src/kiss_fft/tools/fftutil.c
@@ -18,7 +18,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include <string.h>
 #include <unistd.h>
 
-#include "kiss_fft.h"
+#include "../kiss_fft.h"
 #include "kiss_fftndr.h"
 
 static

diff --git a/src/kiss_fft/tools/kfc.h b/src/kiss_fft/tools/kfc.h
index 9b5fd677376b5df66f7fb03366395eb9c6ad982d..321a88a89acfa11042652acd88c96c95312067c1 100644 (file)
--- a/src/kiss_fft/tools/kfc.h
+++ b/src/kiss_fft/tools/kfc.h
@@ -1,6 +1,6 @@
 #ifndef KFC_H
 #define KFC_H
-#include "kiss_fft.h"
+#include "../kiss_fft.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/kiss_fft/tools/kiss_fastfir.c b/src/kiss_fft/tools/kiss_fastfir.c
index 1c96216df502d97d8607ed2e017b62ec6b9224e2..dfd7c8c0929ac25bcc48a955a2b6488277d0301b 100644 (file)
--- a/src/kiss_fft/tools/kiss_fastfir.c
+++ b/src/kiss_fft/tools/kiss_fastfir.c
@@ -12,7 +12,7 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "_kiss_fft_guts.h"
+#include "../_kiss_fft_guts.h"
 
 
 /*

diff --git a/src/kiss_fft/tools/kiss_fftnd.c b/src/kiss_fft/tools/kiss_fftnd.c
index d6c91243a8938088f9d0e74dc8194a14e3a1417a..a1189781f441ce001bd307d4ce82dadcc4b6c8a1 100644 (file)
--- a/src/kiss_fft/tools/kiss_fftnd.c
+++ b/src/kiss_fft/tools/kiss_fftnd.c
@@ -15,7 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 #include "kiss_fftnd.h"
-#include "_kiss_fft_guts.h"
+#include "../_kiss_fft_guts.h"
 
 struct kiss_fftnd_state{
     int dimprod; /* dimsum would be mighty tasty right now */

diff --git a/src/kiss_fft/tools/kiss_fftnd.h b/src/kiss_fft/tools/kiss_fftnd.h
index 42e7df5b54715bbaa0197bc76e15282d09d22c80..ed7a0696a3c2a27733994631c2b3110b4ec4a8de 100644 (file)
--- a/src/kiss_fft/tools/kiss_fftnd.h
+++ b/src/kiss_fft/tools/kiss_fftnd.h
@@ -1,7 +1,7 @@
 #ifndef KISS_FFTND_H
 #define KISS_FFTND_H
 
-#include "kiss_fft.h"
+#include "../kiss_fft.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/kiss_fft/tools/kiss_fftndr.c b/src/kiss_fft/tools/kiss_fftndr.c
index ba550dd10b5a113f9d3e51d12e946007e8382ca4..b593183a4f6689ab00a2b6511b4f1e0c3004c618 100644 (file)
--- a/src/kiss_fft/tools/kiss_fftndr.c
+++ b/src/kiss_fft/tools/kiss_fftndr.c
@@ -13,7 +13,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 #include "kiss_fftndr.h"
-#include "_kiss_fft_guts.h"
+#include "../_kiss_fft_guts.h"
 #define MAX(x,y) ( ( (x)<(y) )?(y):(x) )
 
 struct kiss_fftndr_state

diff --git a/src/kiss_fft/tools/kiss_fftndr.h b/src/kiss_fft/tools/kiss_fftndr.h
index 38ec3ab02374cb7abaf7a1181f8509df47ce51ed..15df650848294852554d42ce13c60d26ee8d9c2d 100644 (file)
--- a/src/kiss_fft/tools/kiss_fftndr.h
+++ b/src/kiss_fft/tools/kiss_fftndr.h
@@ -1,7 +1,7 @@
 #ifndef KISS_NDR_H
 #define KISS_NDR_H
 
-#include "kiss_fft.h"
+#include "../kiss_fft.h"
 #include "kiss_fftr.h"
 #include "kiss_fftnd.h"
 

diff --git a/src/kiss_fft/tools/kiss_fftr.c b/src/kiss_fft/tools/kiss_fftr.c
index f389770bd9213ee90f5fea2a700f53106a1f529b..a9855534422dcd0bddb6d57024b988915d355faa 100644 (file)
--- a/src/kiss_fft/tools/kiss_fftr.c
+++ b/src/kiss_fft/tools/kiss_fftr.c
@@ -13,7 +13,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 #include "kiss_fftr.h"
-#include "_kiss_fft_guts.h"
+#include "../_kiss_fft_guts.h"
 
 struct kiss_fftr_state{
     kiss_fft_cfg substate;

diff --git a/src/kiss_fft/tools/kiss_fftr.h b/src/kiss_fft/tools/kiss_fftr.h
index 72e5a57714df11f15a78640bfd8701f00c85dc77..81d8a8ec1712843086dc65e228f6d3fa0b99a5ff 100644 (file)
--- a/src/kiss_fft/tools/kiss_fftr.h
+++ b/src/kiss_fft/tools/kiss_fftr.h
@@ -1,7 +1,7 @@
 #ifndef KISS_FTR_H
 #define KISS_FTR_H
 
-#include "kiss_fft.h"
+#include "../kiss_fft.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/src/kiss_fft/tools/psdpng.c b/src/kiss_fft/tools/psdpng.c
index d11a54fd2ee43b339713e222f1dcbe1e7ba53b01..ef9ff5bcd2cb6eba12b21bbe501243f44cf73439 100644 (file)
--- a/src/kiss_fft/tools/psdpng.c
+++ b/src/kiss_fft/tools/psdpng.c
@@ -19,7 +19,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include <unistd.h>
 #include <png.h>
 
-#include "kiss_fft.h"
+#include "../kiss_fft.h"
 #include "kiss_fftr.h"
 
 int nfft=1024;

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5a76ffb38f6137b627d8aa703e9850fef055b48e..e2bb83a0b2f0f26f0e42d8a7c0ca97a73b991753 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -59,8 +59,8 @@
 #include "colorscopes/waveform.h"
 #include "colorscopes/rgbparade.h"
 #include "colorscopes/histogram.h"
-#include "audiospectrum.h"
-#include "spectrogram.h"
+#include "audioscopes/audiospectrum.h"
+#include "audioscopes/spectrogram.h"
 #include "archivewidget.h"
 #include "databackup/backupwidget.h"
 

diff --git a/src/mltdevicecapture.h b/src/mltdevicecapture.h
index 7ba44c2cd86005d90459355890226584d00ca35d..ba757335077180dc829706049bfcf3856c081604 100644 (file)
--- a/src/mltdevicecapture.h
+++ b/src/mltdevicecapture.h
@@ -26,7 +26,8 @@
 #include "gentime.h"
 #include "definitions.h"
 #include "abstractmonitor.h"
-#include "mlt/framework/mlt_types.h"
+
+#include <mlt/framework/mlt_types.h>
 
 #include <QtConcurrentRun>
 

diff --git a/src/onmonitoritems/CMakeLists.txt b/src/onmonitoritems/CMakeLists.txt
index 1afa18c3ebf87f566fbfe47607ccee1d3a9622d0..58ece7c0638524a9b29b3fec40882a0f609727d4 100644 (file)
--- a/src/onmonitoritems/CMakeLists.txt
+++ b/src/onmonitoritems/CMakeLists.txt
@@ -1 +1,6 @@
-add_subdirectory(rotoscoping)
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  onmonitoritems/onmonitorcornersitem.cpp
+  onmonitoritems/onmonitorrectitem.cpp
+  PARENT_SCOPE
+)

diff --git a/src/onmonitoritems/rotoscoping/CMakeLists.txt b/src/onmonitoritems/rotoscoping/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..51776fa29c963cbd9702b57b632152d2c3df0cf1 100644 (file)
--- a/src/onmonitoritems/rotoscoping/CMakeLists.txt
+++ b/src/onmonitoritems/rotoscoping/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  onmonitoritems/rotoscoping/bpointitem.cpp
+  onmonitoritems/rotoscoping/nearestpoint.cpp
+  onmonitoritems/rotoscoping/splineitem.cpp
+  PARENT_SCOPE
+)

diff --git a/src/onmonitoritems/rotoscoping/bpointitem.h b/src/onmonitoritems/rotoscoping/bpointitem.h
index 1a767c57eafb4cb3559505e15e3c8c88e5e1547a..536182bff3cd47bed35c95a0bd43058c55b66c42 100644 (file)
--- a/src/onmonitoritems/rotoscoping/bpointitem.h
+++ b/src/onmonitoritems/rotoscoping/bpointitem.h
@@ -19,7 +19,7 @@
 #ifndef BPOINTITEM_H
 #define BPOINTITEM_H
 
-#include "bpoint.h"
+#include "beziercurve/bpoint.h"
 
 #include <QtCore>
 #include <QAbstractGraphicsShapeItem>

diff --git a/src/renderer.h b/src/renderer.h
index eb9f4b03448c6786f565cba5be38fd6879a12300..45e140a1502a4de396c6482aad5a31f253a54bb8 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -32,7 +32,8 @@
 #include "gentime.h"
 #include "definitions.h"
 #include "abstractmonitor.h"
-#include "mlt/framework/mlt_types.h"
+
+#include <mlt/framework/mlt_types.h>
 
 #include <kurl.h>
 

diff --git a/src/rotoscoping/CMakeLists.txt b/src/rotoscoping/CMakeLists.txt
index 8b137891791fe96927ad78e64b0aad7bded08bdc..f38757a11edefd78d96e0565f1e0f3d0caa4300f 100644 (file)
--- a/src/rotoscoping/CMakeLists.txt
+++ b/src/rotoscoping/CMakeLists.txt
@@ -1 +1,5 @@
-
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  rotoscoping/rotowidget.cpp
+  PARENT_SCOPE
+)

diff --git a/src/rotoscoping/rotowidget.h b/src/rotoscoping/rotowidget.h
index 7a0d2d9f7ffa332c1a90c2854ca8ba1761cbe721..235bf62b320c25970e681af20344a8389a339a10 100644 (file)
--- a/src/rotoscoping/rotowidget.h
+++ b/src/rotoscoping/rotowidget.h
@@ -20,7 +20,7 @@
 #define ROTOWIDGET_H
 
 #include "definitions.h"
-#include "bpoint.h"
+#include "beziercurve/bpoint.h"
 #include "timecode.h"
 
 #include <QWidget>

diff --git a/src/simplekeyframes/CMakeLists.txt b/src/simplekeyframes/CMakeLists.txt
index 8b137891791fe96927ad78e64b0aad7bded08bdc..7aa2ba54f55a03b3e23dbfc0c4d98d1935bfc7d7 100644 (file)
--- a/src/simplekeyframes/CMakeLists.txt
+++ b/src/simplekeyframes/CMakeLists.txt
@@ -1 +1,6 @@
-
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  simplekeyframes/simpletimelinewidget.cpp
+  simplekeyframes/simplekeyframewidget.cpp
+  PARENT_SCOPE
+)

diff --git a/src/simplekeyframes/simplekeyframewidget.cpp b/src/simplekeyframes/simplekeyframewidget.cpp
index d7774193a15d1c287f68f399a6340e7a890bbfac..20ede65f9c381eba1f326575b6c5bb9a6b235c49 100644 (file)
--- a/src/simplekeyframes/simplekeyframewidget.cpp
+++ b/src/simplekeyframes/simplekeyframewidget.cpp
@@ -16,7 +16,7 @@
  *   along with Kdenlive.  If not, see <http://www.gnu.org/licenses/>.     *
  ***************************************************************************/
 
-#include "simplekeyframes/simplekeyframewidget.h"
+#include "simplekeyframewidget.h"
 #include "simpletimelinewidget.h"
 #include "timecodedisplay.h"
 

diff --git a/src/stopmotion/CMakeLists.txt b/src/stopmotion/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8cf0261
--- /dev/null
+++ b/src/stopmotion/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  stopmotion/stopmotion.cpp
+  PARENT_SCOPE
+)

diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp
index f76f9c2976442a85c66a90dd55c53e2982661f6f..395c52f58e73b1ef9a21d5bf9792fb15db3a39db 100644 (file)
--- a/src/stopmotion/stopmotion.cpp
+++ b/src/stopmotion/stopmotion.cpp
@@ -16,19 +16,18 @@
  ***************************************************************************/
 
 #include "stopmotion.h"
-#include "../blackmagic/devices.h"
+#include "blackmagic/devices.h"
 #if !defined(Q_OS_FREEBSD) && !defined(Q_OS_KFREEBSD)
-#include "../v4l/v4lcapture.h"
+#include "v4l/v4lcapture.h"
 #endif
-#include "../slideshowclip.h"
-#include "../profilesdialog.h"
-#include "../mltdevicecapture.h"
-#include "../recmonitor.h"
-#include "../monitormanager.h"
+#include "slideshowclip.h"
+#include "profilesdialog.h"
+#include "mltdevicecapture.h"
+#include "recmonitor.h"
+#include "monitormanager.h"
 #include "ui_smconfig_ui.h"
 #include "kdenlivesettings.h"
 
-
 #include <KDebug>
 #include <KGlobalSettings>
 #include <KFileDialog>

diff --git a/src/v4l/CMakeLists.txt b/src/v4l/CMakeLists.txt
new file mode 100644 (file)
index 0000000..562763d
--- /dev/null
+++ b/src/v4l/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(kdenlive_SRCS
+  ${kdenlive_SRCS}
+  v4l/v4lcapture.cpp
+  v4l/src.c
+  PARENT_SCOPE
+)

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
deleted file mode 100644 (file)
index e69de29..0000000