From bb8ad9fbd51713cdb9515e3dcaa69153dba44f04 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Fri, 16 Jan 2009 02:18:58 +0100
Subject: [PATCH] move threads back into the backend

---
 src/backend/Makefile.am                 | 11 +++--------
 src/{lib => backend}/thread-wrapper.hpp |  2 +-
 src/{lib => backend}/threads.c          |  2 +-
 src/{lib => backend}/threads.h          |  0
 src/gui/guistart.cpp                    |  2 +-
 src/lib/Makefile.am                     |  2 --
 tests/lib/subsystem-runner-test.cpp     |  2 +-
 tests/lib/thread-wrapper-test.cpp       |  2 +-
 8 files changed, 8 insertions(+), 15 deletions(-)
 rename src/{lib => backend}/thread-wrapper.hpp (99%)
 rename src/{lib => backend}/threads.c (99%)
 rename src/{lib => backend}/threads.h (100%)

diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 75bcc0d7e..c2161cc82 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -25,6 +25,7 @@ liblumierabackend_la_LIBADD = liblumiera.la
 liblumierabackend_la_SOURCES =					\
 	$(liblumierabackend_la_srcdir)/mediaaccessfacade.cpp	\
 	$(liblumierabackend_la_srcdir)/backend.c		\
+	$(liblumierabackend_la_srcdir)/threads.c		\
 	$(liblumierabackend_la_srcdir)/file.c			\
 	$(liblumierabackend_la_srcdir)/filehandle.c		\
 	$(liblumierabackend_la_srcdir)/filedescriptor.c		\
@@ -39,6 +40,7 @@ liblumierabackend_la_SOURCES =					\
 
 noinst_HEADERS +=						\
 	$(liblumierabackend_la_srcdir)/backend.h		\
+	$(liblumierabackend_la_srcdir)/threads.h		\
 	$(liblumierabackend_la_srcdir)/file.h			\
 	$(liblumierabackend_la_srcdir)/filehandle.h		\
 	$(liblumierabackend_la_srcdir)/filedescriptor.h		\
@@ -46,11 +48,4 @@ noinst_HEADERS +=						\
 	$(liblumierabackend_la_srcdir)/mmap.h			\
 	$(liblumierabackend_la_srcdir)/mmapings.h		\
 	$(liblumierabackend_la_srcdir)/mmapcache.h
-	$(liblumierabackend_la_srcdir)/backend.h		\
-	$(liblumierabackend_la_srcdir)/file.h			\
-	$(liblumierabackend_la_srcdir)/filehandle.h		\
-	$(liblumierabackend_la_srcdir)/filedescriptor.h		\
-	$(liblumierabackend_la_srcdir)/filehandlecache.h	\
-	$(liblumierabackend_la_srcdir)/mmap.h			\
-	$(liblumierabackend_la_srcdir)/mmapings.h		\
-	$(liblumierabackend_la_srcdir)/mmapcache.h
+
diff --git a/src/lib/thread-wrapper.hpp b/src/backend/thread-wrapper.hpp
similarity index 99%
rename from src/lib/thread-wrapper.hpp
rename to src/backend/thread-wrapper.hpp
index 1edc110ee..3c60cda09 100644
--- a/src/lib/thread-wrapper.hpp
+++ b/src/backend/thread-wrapper.hpp
@@ -29,7 +29,7 @@
 #include "lib/sync.hpp"
 
 extern "C" {
-#include "lib/threads.h"
+#include "backend/threads.h"
 }
 
 #include <tr1/functional>
diff --git a/src/lib/threads.c b/src/backend/threads.c
similarity index 99%
rename from src/lib/threads.c
rename to src/backend/threads.c
index 128187095..d0feec9b8 100644
--- a/src/lib/threads.c
+++ b/src/backend/threads.c
@@ -23,7 +23,7 @@
 
 
 //TODO: Lumiera header includes//
-#include "lib/threads.h"
+#include "threads.h"
 
 //TODO: internal/static forward declarations//
 
diff --git a/src/lib/threads.h b/src/backend/threads.h
similarity index 100%
rename from src/lib/threads.h
rename to src/backend/threads.h
diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp
index 86a8a0ab4..e0e3b2930 100644
--- a/src/gui/guistart.cpp
+++ b/src/gui/guistart.cpp
@@ -53,7 +53,7 @@
 #include "gui/guifacade.hpp"
 #include "gui/notification-service.hpp"
 #include "common/subsys.hpp"
-#include "lib/thread-wrapper.hpp"
+#include "backend/thread-wrapper.hpp"
 #include "lib/singleton.hpp"
 
 extern "C" {
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ab9567089..10ad2f8ed 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,6 @@ liblumiera_la_SOURCES =						\
 	$(liblumiera_la_srcdir)/rwlock.c			\
 	$(liblumiera_la_srcdir)/condition.c			\
 	$(liblumiera_la_srcdir)/reccondition.c			\
-	$(liblumiera_la_srcdir)/threads.c			\
 	$(liblumiera_la_srcdir)/luid.c				\
 	$(liblumiera_la_srcdir)/safeclib.c			\
 	$(liblumiera_la_srcdir)/psplay.c			\
@@ -54,7 +53,6 @@ noinst_HEADERS +=						\
 	$(liblumiera_la_srcdir)/rwlock.h			\
 	$(liblumiera_la_srcdir)/condition.h			\
 	$(liblumiera_la_srcdir)/reccondition.h			\
-	$(liblumiera_la_srcdir)/threads.h			\
 	$(liblumiera_la_srcdir)/luid.h				\
 	$(liblumiera_la_srcdir)/safeclib.h			\
 	$(liblumiera_la_srcdir)/psplay.h			\
diff --git a/tests/lib/subsystem-runner-test.cpp b/tests/lib/subsystem-runner-test.cpp
index 06cf5ccfd..99d1fd11f 100644
--- a/tests/lib/subsystem-runner-test.cpp
+++ b/tests/lib/subsystem-runner-test.cpp
@@ -27,7 +27,7 @@
 #include "common/option.hpp"
 
 #include "include/symbol.hpp"
-#include "lib/thread-wrapper.hpp"
+#include "backend/thread-wrapper.hpp"
 #include "lib/error.hpp"
 #include "lib/query.hpp"
 #include "lib/util.hpp"
diff --git a/tests/lib/thread-wrapper-test.cpp b/tests/lib/thread-wrapper-test.cpp
index e7eb0c5ab..0183cf391 100644
--- a/tests/lib/thread-wrapper-test.cpp
+++ b/tests/lib/thread-wrapper-test.cpp
@@ -24,7 +24,7 @@
 #include "lib/test/run.hpp"
 
 #include "include/symbol.hpp"
-#include "lib/thread-wrapper.hpp"
+#include "backend/thread-wrapper.hpp"
 #include "lib/sync.hpp"
 
 #include <tr1/functional>