Move binaries to bin and make ring buffer a lib

19 files changed, 26 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8aae64..95afb55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,8 +58,7 @@ pkg_check_modules(GMODULE2 gmodule-2.0>=2.24 REQUIRED)
 pkg_check_modules(GIO2 gio-2.0>=2.24 REQUIRED)
 
 include_directories(
-    #    ${CMAKE_CURRENT_BINARY_DIR}/src
-    #${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${GLIB2_INCLUDE_DIRS}
     ${GOBJECT2_INCLUDE_DIRS}
     ${GMODULE2_INCLUDE_DIRS}
@@ -74,8 +73,7 @@ set(UCA_DEPS
 add_subdirectory(src)
 add_subdirectory(plugins)
 add_subdirectory(test)
-add_subdirectory(tools)
-add_subdirectory(gui)
+add_subdirectory(bin)
 
 include(CPack)
 
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
new file mode 100644
index 0000000..b8d065b
--- /dev/null
+++ b/bin/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_library(ringbuffer
+            ${CMAKE_CURRENT_SOURCE_DIR}/common/ring-buffer.c)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common)
+
+add_subdirectory(gui)
+add_subdirectory(tools)
+
diff --git a/tools/ring-buffer.c b/bin/common/ring-buffer.c
index 039024f..039024f 100644
--- a/tools/ring-buffer.c
+++ b/bin/common/ring-buffer.c
diff --git a/tools/ring-buffer.h b/bin/common/ring-buffer.h
index a3758cb..a3758cb 100644
--- a/tools/ring-buffer.h
+++ b/bin/common/ring-buffer.h
diff --git a/gui/CMakeLists.txt b/bin/gui/CMakeLists.txt
index f0d90c3..f64bd02 100644
--- a/gui/CMakeLists.txt
+++ b/bin/gui/CMakeLists.txt
@@ -7,8 +7,6 @@ find_package(PkgConfig)
 
 pkg_check_modules(GTK2 gtk+-2.0>=2.22)
 pkg_check_modules(GTHREAD2 gthread-2.0)
-pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED)
-pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -17,30 +15,23 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.glade
                ${CMAKE_CURRENT_BINARY_DIR})
 
 # --- Build targets -----------------------------------------------------------
-include_directories(
-    ${GLIB2_INCLUDE_DIRS}
-    ${GOBJECT2_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../src
-    ${CMAKE_CURRENT_SOURCE_DIR}/../tools
-    )
-
-message("include: ${CMAKE_CURRENT_BINARY_DIR}")
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if (GTK2_FOUND)
     include_directories(${GTK2_INCLUDE_DIRS})
 
     add_executable(control
         control.c
-        ../tools/ring-buffer.c    # yes this sucks and should be fixed
         egg-property-cell-renderer.c
         egg-property-tree-view.c
         egg-histogram-view.c)
 
-    target_link_libraries(control uca
+    target_link_libraries(control
+        m
+        uca
+        ringbuffer
         ${GTK2_LIBRARIES} 
-        ${GTHREAD2_LIBRARIES}
-        m)
+        ${GTHREAD2_LIBRARIES})
 
     install(TARGETS control
         RUNTIME DESTINATION bin)
diff --git a/gui/config.h.in b/bin/gui/config.h.in
index e7de9c6..e7de9c6 100644
--- a/gui/config.h.in
+++ b/bin/gui/config.h.in
diff --git a/gui/control.c b/bin/gui/control.c
index c177f07..c177f07 100644
--- a/gui/control.c
+++ b/bin/gui/control.c
diff --git a/gui/control.glade b/bin/gui/control.glade
index eec9dde..eec9dde 100644
--- a/gui/control.glade
+++ b/bin/gui/control.glade
diff --git a/gui/egg-histogram-view.c b/bin/gui/egg-histogram-view.c
index 812af7a..812af7a 100644
--- a/gui/egg-histogram-view.c
+++ b/bin/gui/egg-histogram-view.c
diff --git a/gui/egg-histogram-view.h b/bin/gui/egg-histogram-view.h
index 7a62fca..7a62fca 100644
--- a/gui/egg-histogram-view.h
+++ b/bin/gui/egg-histogram-view.h
diff --git a/gui/egg-property-cell-renderer.c b/bin/gui/egg-property-cell-renderer.c
index 9df5cc3..9df5cc3 100644
--- a/gui/egg-property-cell-renderer.c
+++ b/bin/gui/egg-property-cell-renderer.c
diff --git a/gui/egg-property-cell-renderer.h b/bin/gui/egg-property-cell-renderer.h
index d4dbe02..d4dbe02 100644
--- a/gui/egg-property-cell-renderer.h
+++ b/bin/gui/egg-property-cell-renderer.h
diff --git a/gui/egg-property-tree-view.c b/bin/gui/egg-property-tree-view.c
index 52d1e10..52d1e10 100644
--- a/gui/egg-property-tree-view.c
+++ b/bin/gui/egg-property-tree-view.c
diff --git a/gui/egg-property-tree-view.h b/bin/gui/egg-property-tree-view.h
index e8fd0fe..e8fd0fe 100644
--- a/gui/egg-property-tree-view.h
+++ b/bin/gui/egg-property-tree-view.h
diff --git a/tools/CMakeLists.txt b/bin/tools/CMakeLists.txt
index b16f018..a52bb97 100644
--- a/tools/CMakeLists.txt
+++ b/bin/tools/CMakeLists.txt
@@ -3,22 +3,15 @@ cmake_minimum_required(VERSION 2.8)
 add_definitions("--std=c99 -Wall")
 
 # --- Find packages and libraries ---------------------------------------------
-find_package(PkgConfig)
 find_package(TIFF)
 
-pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED)
-pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED)
-
 # --- Build targets -----------------------------------------------------------
 include_directories(
-    ${GLIB2_INCLUDE_DIRS}
-    ${GOBJECT2_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/../src
     )
 
-set(libs uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+set(libs uca)
 
 if (TIFF_FOUND)
     set(HAVE_LIBTIFF "1")
@@ -29,12 +22,17 @@ endif ()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+# --- gen-doc
 add_executable(gen-doc gen-doc.c)
 target_link_libraries(gen-doc ${libs})
 
-add_executable(uca-grab grab.c ring-buffer.c)
-target_link_libraries(uca-grab ${libs})
+# --- uca-grab
+add_executable(uca-grab grab.c)
+target_link_libraries(uca-grab
+                      ringbuffer
+                      ${libs})
 
+# --- uca-benchmark
 add_executable(benchmark benchmark.c)
 target_link_libraries(benchmark ${libs})
 
diff --git a/tools/benchmark.c b/bin/tools/benchmark.c
index 0939d78..0939d78 100644
--- a/tools/benchmark.c
+++ b/bin/tools/benchmark.c
diff --git a/tools/config.h.in b/bin/tools/config.h.in
index aea5237..aea5237 100644
--- a/tools/config.h.in
+++ b/bin/tools/config.h.in
diff --git a/tools/gen-doc.c b/bin/tools/gen-doc.c
index d27bdd8..d27bdd8 100644
--- a/tools/gen-doc.c
+++ b/bin/tools/gen-doc.c
diff --git a/tools/grab.c b/bin/tools/grab.c
index 972f000..972f000 100644
--- a/tools/grab.c
+++ b/bin/tools/grab.c