WIP: Merge common into lib

* breaks lumigui linking
 * test non functional yet
 * tools cant not be linked because of cross dependency problems

Makefile.am

@@ -44,7 +44,6 @@ include $(top_srcdir)/admin/Makefile.am
 
 # core
 include $(top_srcdir)/src/proc/Makefile.am
-include $(top_srcdir)/src/common/Makefile.am
 include $(top_srcdir)/src/lib/Makefile.am
 include $(top_srcdir)/src/backend/Makefile.am
 include $(top_srcdir)/src/lumiera/Makefile.am

src/backend/enginefacade.cpp

@@ -22,7 +22,7 @@
 
 
 #include "backend/enginefacade.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <string>
 

src/backend/mediaaccessfacade.cpp

@@ -23,7 +23,7 @@
 
 #include "backend/mediaaccessfacade.hpp"
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 using util::isnil;
 using lumiera::error::Invalid;

src/backend/mediaaccessfacade.hpp

@@ -25,7 +25,7 @@
 #define BACKEND_INTERFACE_MEDIAACCESSFACADE_H
 
 
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 #include "include/error.hpp"
 
 

src/backend/netnodefacade.cpp

@@ -22,7 +22,7 @@
 
 
 #include "backend/netnodefacade.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <string>
 

src/backend/scriptrunnerfacade.cpp

@@ -22,7 +22,7 @@
 
 
 #include "backend/scriptrunnerfacade.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <string>
 

src/gui/Makefile.am

@@ -101,12 +101,11 @@ lumigui_SOURCES =								\
 
 lumigui_LDFLAGS =
 # $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
-lumigui_LDADD = $(LUMIERA_GUI_LIBS) liblumicommon.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS)
+lumigui_LDADD = $(LUMIERA_GUI_LIBS) liblumiera.la $(NOBUGMT_LUMIERA_LIBS)
 
-lumigui_DEPENDENCIES =														\
-	$(top_builddir)/lumiera_ui.rc											\
-	$(top_builddir)/liblumicommon.a											\
-	$(top_builddir)/liblumiera.a
+lumigui_DEPENDENCIES =				\
+	$(top_builddir)/lumiera_ui.rc		\
+	$(top_builddir)/liblumiera.la
 
 $(top_builddir)/lumiera_ui.rc:
 	cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)

src/gui/gtk-lumiera.hpp

@@ -33,7 +33,7 @@
 #include <vector>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
-#include "../common/util.hpp"
+#include "lib/util.hpp"
 
 extern "C" {
 #include <gavl/gavltime.h>

src/gui/guinotificationfacade.cpp

@@ -22,9 +22,9 @@
 
 
 #include "include/guinotificationfacade.h"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 #include "include/nobugcfg.h"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 extern "C" {
 #include "lumiera/interfacedescriptor.h"

src/gui/model/project.hpp

@@ -28,7 +28,7 @@
 #define PROJECT_HPP
 
 #include "sequence.hpp"
-#include "../../common/observable-list.hpp"
+#include "lib/observable-list.hpp"
 
 namespace gui {
 namespace model {

src/include/configfacade.hpp

@@ -36,7 +36,7 @@
 #define INTERFACE_CONFIGFACADE_H
 
 
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <string>
 

src/include/guinotificationfacade.h

@@ -40,7 +40,7 @@
 
 #ifdef __cplusplus  /* ============== C++ Interface ================= */
 
-#include "common/singletonsubclass.hpp"
+#include "lib/singletonsubclass.hpp"
 
 #include <string>
 

src/lib/Makefile.am

@@ -20,30 +20,38 @@ lib_LTLIBRARIES += liblumiera.la
 
 liblumiera_la_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\""
 
-liblumiera_la_SOURCES =					\
-	$(liblumiera_la_srcdir)/error.c			\
-	$(liblumiera_la_srcdir)/mutex.c			\
-	$(liblumiera_la_srcdir)/rwlock.c		\
-	$(liblumiera_la_srcdir)/condition.c		\
-	$(liblumiera_la_srcdir)/luid.c			\
-	$(liblumiera_la_srcdir)/safeclib.c		\
-	$(liblumiera_la_srcdir)/cuckoo.c		\
-	$(liblumiera_la_srcdir)/psplay.c		\
-	$(liblumiera_la_srcdir)/mrucache.c		\
-	$(liblumiera_la_srcdir)/time.c			\
-	$(liblumiera_la_srcdir)/config.c		\
-	$(liblumiera_la_srcdir)/config_typed.c		\
-	$(liblumiera_la_srcdir)/config_wordlist.c	\
-	$(liblumiera_la_srcdir)/configentry.c		\
-	$(liblumiera_la_srcdir)/configitem.c		\
-	$(liblumiera_la_srcdir)/config_lookup.c		\
-	$(liblumiera_la_srcdir)/config_interface.c	\
-	$(liblumiera_la_srcdir)/interface.c		\
-	$(liblumiera_la_srcdir)/interfaceregistry.c	\
-	$(liblumiera_la_srcdir)/plugin.c		\
-	$(liblumiera_la_srcdir)/plugin_dynlib.c		\
-	$(liblumiera_la_srcdir)/allocationcluster.cpp	\
-	$(liblumiera_la_srcdir)/external/libgavl.cpp	\
+liblumiera_la_SOURCES =						\
+	$(liblumiera_la_srcdir)/error.c				\
+	$(liblumiera_la_srcdir)/mutex.c				\
+	$(liblumiera_la_srcdir)/rwlock.c			\
+	$(liblumiera_la_srcdir)/condition.c			\
+	$(liblumiera_la_srcdir)/luid.c				\
+	$(liblumiera_la_srcdir)/safeclib.c			\
+	$(liblumiera_la_srcdir)/cuckoo.c			\
+	$(liblumiera_la_srcdir)/psplay.c			\
+	$(liblumiera_la_srcdir)/mrucache.c			\
+	$(liblumiera_la_srcdir)/time.c				\
+	$(liblumiera_la_srcdir)/config.c			\
+	$(liblumiera_la_srcdir)/config_typed.c			\
+	$(liblumiera_la_srcdir)/config_wordlist.c		\
+	$(liblumiera_la_srcdir)/configentry.c			\
+	$(liblumiera_la_srcdir)/configitem.c			\
+	$(liblumiera_la_srcdir)/config_lookup.c			\
+	$(liblumiera_la_srcdir)/config_interface.c		\
+	$(liblumiera_la_srcdir)/interface.c			\
+	$(liblumiera_la_srcdir)/interfaceregistry.c		\
+	$(liblumiera_la_srcdir)/plugin.c			\
+	$(liblumiera_la_srcdir)/plugin_dynlib.c			\
+	$(liblumiera_la_srcdir)/allocationcluster.cpp		\
+	$(liblumiera_la_srcdir)/external/libgavl.cpp		\
+	$(liblumiera_la_srcdir)/lumitime.cpp			\
+	$(liblumiera_la_srcdir)/util.cpp			\
+	$(liblumiera_la_srcdir)/visitor.cpp			\
+	$(liblumiera_la_srcdir)/configrules.cpp			\
+	$(liblumiera_la_srcdir)/error.cpp			\
+	$(liblumiera_la_srcdir)/query.cpp			\
+	$(liblumiera_la_srcdir)/query/mockconfigrules.cpp	\
+	$(liblumiera_la_srcdir)/streamtype.cpp			\
 	$(liblumiera_la_srcdir)/cmdline.cpp
 
 noinst_HEADERS +=						\
@@ -71,4 +79,31 @@ noinst_HEADERS +=						\
 	$(liblumiera_la_srcdir)/scopedholdertransfer.hpp	\
 	$(liblumiera_la_srcdir)/scopedholder.hpp		\
 	$(liblumiera_la_srcdir)/external/libgavl.hpp		\
-	$(liblumiera_la_srcdir)/lifecycleregistry.hpp
+	$(liblumiera_la_srcdir)/lifecycleregistry.hpp		\
+	$(liblumiera_la_srcdir)/factory.hpp			\
+	$(liblumiera_la_srcdir)/frameid.hpp			\
+	$(liblumiera_la_srcdir)/singleton.hpp			\
+	$(liblumiera_la_srcdir)/singletonpolicies.hpp		\
+	$(liblumiera_la_srcdir)/singletonpreconfigure.hpp	\
+	$(liblumiera_la_srcdir)/lumitime.hpp			\
+	$(liblumiera_la_srcdir)/visitor.hpp			\
+	$(liblumiera_la_srcdir)/visitordispatcher.hpp		\
+	$(liblumiera_la_srcdir)/visitorpolicies.hpp		\
+	$(liblumiera_la_srcdir)/configrules.hpp			\
+	$(liblumiera_la_srcdir)/multithread.hpp			\
+	$(liblumiera_la_srcdir)/p.hpp				\
+	$(liblumiera_la_srcdir)/query.hpp			\
+	$(liblumiera_la_srcdir)/singletonfactory.hpp		\
+	$(liblumiera_la_srcdir)/singletonsubclass.hpp		\
+	$(liblumiera_la_srcdir)/meta/typelist.hpp		\
+	$(liblumiera_la_srcdir)/meta/configflags.hpp		\
+	$(liblumiera_la_srcdir)/meta/generator.hpp		\
+	$(liblumiera_la_srcdir)/meta/typelistutil.hpp		\
+	$(liblumiera_la_srcdir)/util.hpp			\
+	$(liblumiera_la_srcdir)/observable-list.hpp		\
+	$(liblumiera_la_srcdir)/test/mockinjector.hpp		\
+	$(liblumiera_la_srcdir)/test/suite.hpp			\
+	$(liblumiera_la_srcdir)/test/testoption.hpp		\
+	$(liblumiera_la_srcdir)/test/run.hpp			\
+	$(liblumiera_la_srcdir)/query/mockconfigrules.hpp
+

src/lib/allocationcluster.cpp

@@ -23,7 +23,7 @@
 
 #include "lib/allocationcluster.hpp"
 #include "include/error.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 using util::isnil;
 

src/lib/allocationcluster.hpp

@@ -51,7 +51,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
-#include "common/multithread.hpp"
+#include "lib/multithread.hpp"
 #include "include/error.hpp"
 #include "lib/scopedholder.hpp"
 #include "lib/scopedholdertransfer.hpp"

src/lib/cmdline.cpp

@@ -23,7 +23,7 @@
 
 
 #include "lib/cmdline.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 #include <boost/regex.hpp>

src/lib/configrules.cpp

@@ -21,9 +21,9 @@
 * *****************************************************/
 
 
-#include "common/configrules.hpp"
-#include "common/query/mockconfigrules.hpp"
-//#include "common/util.hpp"
+#include "lib/configrules.hpp"
+#include "lib/query/mockconfigrules.hpp"
+//#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 

src/lib/configrules.hpp

@@ -46,10 +46,10 @@
 #ifndef LUMIERA_CONFIGRULES_H
 #define LUMIERA_CONFIGRULES_H
 
-#include "common/p.hpp"
-#include "common/query.hpp"
-#include "common/meta/generator.hpp"
-#include "common/singletonsubclass.hpp"
+#include "lib/p.hpp"
+#include "lib/query.hpp"
+#include "lib/meta/generator.hpp"
+#include "lib/singletonsubclass.hpp"
 
 //TODO: is it sensible to bring in the types explicitly here? (it's not necessary, but may be convenient...)
 #include "proc/mobject/session/track.hpp"

src/lib/error.cpp

@@ -23,7 +23,7 @@
 
 
 #include "include/error.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <exception>
 #include <typeinfo>

src/lib/lifecycleregistry.hpp

@@ -44,7 +44,7 @@
 #include <tr1/functional>
 #include <boost/noncopyable.hpp>
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 
 namespace lumiera {

src/lib/lumitime.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "common/lumitime.hpp"
+#include "lib/lumitime.hpp"
 #include <limits>
 
 

src/lib/meta/configflags.hpp

@@ -49,7 +49,7 @@
 #define LUMIERA_META_CONFIGFLAGS_H
 
 
-#include "common/meta/typelist.hpp"
+#include "lib/meta/typelist.hpp"
 
 
 namespace lumiera {

src/lib/meta/generator.hpp

@@ -53,7 +53,7 @@ This code is heavily inspired by
 #ifndef LUMIERA_META_GENERATOR_H
 #define LUMIERA_META_GENERATOR_H
 
-#include "common/meta/typelist.hpp"
+#include "lib/meta/typelist.hpp"
 
 
 

src/lib/meta/typelistutil.hpp

@@ -26,7 +26,7 @@
 
 
   
-#include "common/meta/typelist.hpp"
+#include "lib/meta/typelist.hpp"
 
 namespace lumiera {
   namespace typelist {

src/lib/multithread.hpp

@@ -27,7 +27,7 @@
 #define LUMIERA_MULTITHREAD_H
 
 #include "include/nobugcfg.h"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 
 namespace lumiera

src/lib/query.cpp

@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/query.hpp"
-#include "common/util.hpp"
+#include "lib/query.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 #include <boost/algorithm/string.hpp>

src/lib/query/mockconfigrules.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "common/query/mockconfigrules.hpp"
+#include "lib/query/mockconfigrules.hpp"
 
 #include "proc/mobject/session/track.hpp"
 #include "proc/asset/procpatt.hpp"
@@ -29,7 +29,7 @@
 
 
 #include "include/nobugcfg.h"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 using util::isnil;
 

src/lib/query/mockconfigrules.hpp

@@ -39,8 +39,8 @@
 #define LUMIERA_MOCKCONFIGRULES_H
 
 #include "proc/mobject/session.hpp"
-#include "common/configrules.hpp"
-#include "common/util.hpp"
+#include "lib/configrules.hpp"
+#include "lib/util.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/any.hpp>

src/lib/singleton.hpp

@@ -44,9 +44,9 @@
 #define LUMIERA_SINGLETON_H
 
 
-#include "common/singletonpolicies.hpp"
-#include "common/singletonfactory.hpp"
-#include "common/singletonpreconfigure.hpp"
+#include "lib/singletonpolicies.hpp"
+#include "lib/singletonfactory.hpp"
+#include "lib/singletonpreconfigure.hpp"
 
 
 #endif

src/lib/singletonfactory.hpp

@@ -35,9 +35,9 @@ This code is heavily inspired by
 #define LUMIERA_SINGLETONFACTORY_H
 
 
-#include "common/singletonpolicies.hpp"  // several Policies usable together with SingletonFactory
+#include "lib/singletonpolicies.hpp"  // several Policies usable together with SingletonFactory
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 

src/lib/singletonpolicies.hpp

@@ -34,7 +34,7 @@ This code is heavily inspired by
 #ifndef LUMIERA_SINGLETONPOLICIES_H
 #define LUMIERA_SINGLETONPOLICIES_H
 
-#include "common/multithread.hpp"
+#include "lib/multithread.hpp"
 #include "include/error.hpp"
 
 #include <vector>

src/lib/singletonpreconfigure.hpp

@@ -44,7 +44,7 @@
 #ifndef LUMIERA_SINGLETONPRECONFIGURE_H
 #define LUMIERA_SINGLETONPRECONFIGURE_H
 
-#include "common/test/mockinjector.hpp"
+#include "lib/test/mockinjector.hpp"
 
 
 namespace lumiera

src/lib/singletonsubclass.hpp

@@ -39,7 +39,7 @@
 #define LUMIERA_SINGLETONSUBCLASS_H
 
 
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <typeinfo>

src/lib/streamtype.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "common/streamtype.hpp"
+#include "lib/streamtype.hpp"
 
 
 namespace lumiera

src/lib/streamtype.hpp

@@ -35,7 +35,7 @@
 #define LUMIERA_STREAMTYPE_HPP
 
 
-#include "common/query.hpp"
+#include "lib/query.hpp"
 
 #include <boost/noncopyable.hpp>
 

src/lib/test/mockinjector.hpp

@@ -26,7 +26,7 @@
 #define LUMIERA_TEST_MOCKINJECTOR_H
 
 
-#include "common/singletonfactory.hpp"
+#include "lib/singletonfactory.hpp"
 
 #include <boost/scoped_ptr.hpp>
 

src/lib/test/run.hpp

@@ -30,8 +30,8 @@
 
 #include "include/nobugcfg.h"
 
-#include "common/test/suite.hpp"
-#include "common/util.hpp"
+#include "lib/test/suite.hpp"
+#include "lib/util.hpp"
 
 #include <vector>
 #include <string>

src/lib/test/suite.cpp

@@ -32,10 +32,10 @@
 
 #include "include/nobugcfg.h"
 #include "lib/cmdline.hpp"
-#include "common/test/suite.hpp"
-#include "common/test/run.hpp"
+#include "lib/test/suite.hpp"
+#include "lib/test/run.hpp"
 #include "include/error.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 
 

src/lib/test/testoption.cpp

@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/testoption.hpp"
-#include "common/test/suite.hpp"
+#include "lib/test/testoption.hpp"
+#include "lib/test/suite.hpp"
 
 #include "include/error.hpp"
 

src/lib/util.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/function.hpp>

src/lib/variant.hpp

@@ -41,8 +41,8 @@
 #define LUMIERA_VARIANT_H
 
 
-#include "common/meta/typelistutil.hpp"
-#include "common/meta/generator.hpp"
+#include "lib/meta/typelistutil.hpp"
+#include "lib/meta/generator.hpp"
 
 #include <boost/noncopyable.hpp>
 

src/lib/visitor.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "common/visitor.hpp"
+#include "lib/visitor.hpp"
 
 namespace lumiera
   {

src/lib/visitor.hpp

@@ -76,10 +76,10 @@ Credits for many further implementation ideas go to
 #ifndef LUMIERA_VISITOR_H
 #define LUMIERA_VISITOR_H
 
-#include "common/visitorpolicies.hpp"
-#include "common/visitordispatcher.hpp"
+#include "lib/visitorpolicies.hpp"
+#include "lib/visitordispatcher.hpp"
 
-#include "common/meta/typelist.hpp"
+#include "lib/meta/typelist.hpp"
 
 
 namespace lumiera

src/lib/visitordispatcher.hpp

@@ -26,9 +26,9 @@
 #define LUMIERA_VISITORDISPATCHER_H
 
 #include "include/error.hpp"
-#include "common/util.hpp"
-#include "common/singleton.hpp"
-#include "common/multithread.hpp"
+#include "lib/util.hpp"
+#include "lib/singleton.hpp"
+#include "lib/multithread.hpp"
 
 #include <vector>
 

src/lib/wrapperptr.hpp

@@ -26,12 +26,12 @@
 #define LUMIERA_WRAPPERPTR_H
 
 
-#include "common/variant.hpp"
-#include "common/accesscasted.hpp"
+#include "lib/variant.hpp"
+#include "lib/accesscasted.hpp"
 
-#include "common/meta/typelist.hpp"
+#include "lib/meta/typelist.hpp"
 #include "proc/mobject/placement.hpp"
-#include "common/p.hpp"
+#include "lib/p.hpp"
 
 
 namespace asset   { class Asset; }

src/lumiera/appstate.cpp

@@ -35,7 +35,7 @@ extern "C" {
 #include "lib/plugin.h"
 }
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/configfacade.hpp" //////////TODO: temp hack to force configfacade.o to be linked in
 
 using util::cStr;

src/lumiera/guifacade.cpp

@@ -24,7 +24,7 @@
 #include "gui/guifacade.hpp"
 #include "include/guinotificationfacade.h"
 #include "include/error.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 #include "lib/functorutil.hpp"
 #include "lumiera/instancehandle.hpp"
 

src/lumiera/guistart.cpp

@@ -45,7 +45,7 @@
 
 #include "gui/guifacade.hpp"
 #include "lumiera/subsys.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 extern "C" {
 #include "lib/interface.h"

src/lumiera/interfaceproxy.cpp

@@ -21,9 +21,9 @@
 * *****************************************************/
 
 
-#include "common/singletonsubclass.hpp"
+#include "lib/singletonsubclass.hpp"
 #include "include/guinotificationfacade.h"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/error.hpp"
 
 extern "C" {

src/lumiera/option.cpp

@@ -24,7 +24,7 @@
 #include "lumiera/option.hpp"
 
 #include "include/error.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 
 

src/lumiera/subsys.cpp

@@ -24,7 +24,7 @@
 #include "lumiera/subsys.hpp"
 
 #include "include/error.hpp"
-//#include "common/util.hpp"
+//#include "lib/util.hpp"
 
 
 //using util::isnil;

src/lumiera/subsystemrunner.hpp

@@ -25,9 +25,9 @@
 #define LUMIERA_SUBSYSTEMRUNNER_H
 
 #include "include/error.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "lumiera/subsys.hpp"
-#include "common/multithread.hpp"
+#include "lib/multithread.hpp"
 
 #include <tr1/functional>
 #include <vector>

src/proc/asset.cpp

@@ -23,7 +23,7 @@
 
 #include "proc/asset.hpp"
 #include "proc/assetmanager.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <boost/function.hpp>
 #include <boost/format.hpp>

src/proc/asset.hpp

@@ -58,7 +58,7 @@
 #include "proc/asset/category.hpp"
 #include "include/nobugcfg.h"
 #include "include/error.hpp"
-#include "common/p.hpp"
+#include "lib/p.hpp"
 
 #include <boost/type_traits/is_base_of.hpp>
 #include <boost/operators.hpp>

src/proc/asset/category.cpp

@@ -22,7 +22,7 @@
 
 
 #include "proc/asset/category.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 #include <boost/algorithm/string.hpp>

src/proc/asset/media.cpp

@@ -28,7 +28,7 @@
 #include "proc/asset/unknown.hpp"
 #include "proc/mobject/session/clip.hpp"
 #include "proc/mobject/session/mobjectfactory.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 #include <boost/regex.hpp>

src/proc/asset/media.hpp

@@ -38,7 +38,7 @@
 #include "pre_a.hpp"
 
 #include "proc/asset.hpp"
-#include "common/factory.hpp"
+#include "lib/factory.hpp"
 #include "proc/mobject/mobject.hpp"
 #include "proc/mobject/session/clip.hpp"
 

src/proc/asset/meta.cpp

@@ -23,7 +23,7 @@
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/meta.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 

src/proc/asset/meta.hpp

@@ -39,7 +39,7 @@
 #include "pre_a.hpp"
 
 #include "proc/asset.hpp"
-#include "common/factory.hpp"
+#include "lib/factory.hpp"
 
 
 

src/proc/asset/pipe.cpp

@@ -22,7 +22,7 @@
 
 
 #include "proc/asset/pipe.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 using util::isnil;
 

src/proc/asset/proc.cpp

@@ -23,7 +23,7 @@
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/proc.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 

src/proc/asset/proc.hpp

@@ -38,7 +38,7 @@
 #include "pre_a.hpp"
 
 #include "proc/asset.hpp"
-#include "common/factory.hpp"
+#include "lib/factory.hpp"
 
 
 

src/proc/asset/procpatt.cpp

@@ -25,7 +25,7 @@
 #include "proc/asset/proc.hpp"
 #include "proc/assetmanager.hpp"
 #include "proc/asset/buildinstruct.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 using util::isnil;
 

src/proc/asset/procpatt.hpp

@@ -24,7 +24,7 @@
 #ifndef ASSET_PROCPATT_H
 #define ASSET_PROCPATT_H
 
-#include "common/query.hpp"
+#include "lib/query.hpp"
 #include "proc/asset/struct.hpp"
 
 #include <vector>

src/proc/asset/struct.cpp

@@ -26,11 +26,11 @@
 #include "proc/asset/procpatt.hpp"
 #include "proc/asset/track.hpp"
 #include "proc/asset/pipe.hpp"
-#include "common/configrules.hpp"
+#include "lib/configrules.hpp"
 
 #include "proc/asset/structfactoryimpl.hpp"
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "include/nobugcfg.h"
 
 #include <boost/format.hpp>

src/proc/asset/struct.hpp

@@ -40,9 +40,9 @@
 #include "pre_a.hpp"
 
 #include "proc/asset.hpp"
-#include "common/query.hpp"
-#include "common/factory.hpp"
-#include "common/singleton.hpp"
+#include "lib/query.hpp"
+#include "lib/factory.hpp"
+#include "lib/singleton.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <string>

src/proc/asset/structfactoryimpl.hpp

@@ -35,9 +35,9 @@
 
 
 #include "proc/mobject/session.hpp"
-#include "common/configrules.hpp"
+#include "lib/configrules.hpp"
 #include "include/error.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <boost/format.hpp>
 

src/proc/assetmanager.cpp

@@ -24,8 +24,8 @@
 #include "proc/assetmanager.hpp"
 #include "proc/asset/db.hpp"
 
-#include "common/multithread.hpp"
-#include "common/util.hpp"
+#include "lib/multithread.hpp"
+#include "lib/util.hpp"
 
 #include <boost/function.hpp>
 

src/proc/assetmanager.hpp

@@ -40,7 +40,7 @@
 
 #include "proc/asset.hpp"
 #include "include/error.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 
 #include <cstddef>

src/proc/common.hpp

@@ -42,9 +42,9 @@
 
     /* common types frequently used... */
 
-#include "common/p.hpp"
-#include "common/util.hpp"
-#include "common/lumitime.hpp"
+#include "lib/p.hpp"
+#include "lib/util.hpp"
+#include "lib/lumitime.hpp"
 #include "include/symbol.hpp"
 #include "include/error.hpp"   ///< pulls in NoBug via nobugcfg.h
 

src/proc/control/mediaimpllib.hpp

@@ -25,7 +25,7 @@
 #define CONTROL_MEDIAIMPLLIB_H
 
 
-#include "common/streamtype.hpp"
+#include "lib/streamtype.hpp"
 
 
 

src/proc/control/stypemanager.hpp

@@ -25,8 +25,8 @@
 #define CONTROL_STYPEMANAGER_H
 
 
-#include "common/streamtype.hpp"
-#include "common/singleton.hpp"
+#include "lib/streamtype.hpp"
+#include "lib/singleton.hpp"
 
 #include <boost/scoped_ptr.hpp>
 

src/proc/control/styperegistry.hpp

@@ -37,9 +37,9 @@
 #define CONTROL_STYPEREGISTRY_H
 
 
-//#include "common/query.hpp"
-//#include "common/util.hpp"
-//#include "common/p.hpp"
+//#include "lib/query.hpp"
+//#include "lib/util.hpp"
+//#include "lib/p.hpp"
 
 //#include <set>
 //#include <vector>

src/proc/engine/buffhandle.hpp

@@ -40,7 +40,7 @@
 
 
 #include "include/error.hpp"
-#include "common/streamtype.hpp"
+#include "lib/streamtype.hpp"
 
 
 namespace engine {

src/proc/engine/nodeoperation.hpp

@@ -63,8 +63,8 @@
 #include "proc/engine/bufftable.hpp"
 #include "proc/engine/nodeinvocation.hpp"
 
-#include "common/meta/util.hpp"
-#include "common/meta/configflags.hpp"
+#include "lib/meta/util.hpp"
+#include "lib/meta/configflags.hpp"
 
 
 

src/proc/engine/nodewiring.cpp

@@ -26,7 +26,7 @@
 #include "proc/engine/nodeoperation.hpp"
 #include "proc/engine/nodewiringconfig.hpp"
 
-#include "common/meta/typelistutil.hpp"
+#include "lib/meta/typelistutil.hpp"
 
 
 namespace engine {

src/proc/engine/nodewiringconfig.hpp

@@ -51,8 +51,8 @@
 #define ENGINE_NODEWIRINGCONFIG_H
 
 
-#include "common/util.hpp"
-#include "common/meta/configflags.hpp"
+#include "lib/util.hpp"
+#include "lib/meta/configflags.hpp"
 
 #include <boost/function.hpp>
 #include <bitset>

src/proc/facade.cpp

@@ -22,7 +22,7 @@
 
 
 #include "proc/facade.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <string>
 

src/proc/mobject/builder/buildertool.hpp

@@ -53,10 +53,10 @@
 #ifndef MOBJECT_BUILDER_TOOL_H
 #define MOBJECT_BUILDER_TOOL_H
 
-#include "common/visitor.hpp"
-#include "common/wrapperptr.hpp"
+#include "lib/visitor.hpp"
+#include "lib/wrapperptr.hpp"
 
-#include "common/p.hpp"
+#include "lib/p.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/mobject/explicitplacement.hpp"
 

src/proc/mobject/builder/operationpoint.hpp

@@ -25,7 +25,7 @@
 #define MOBJECT_BUILDER_OPERATIONPOINT_H
 
 #include "proc/engine/procnode.hpp"
-#include "common/query.hpp"
+#include "lib/query.hpp"
 
 #include <vector>
 #include <string>

src/proc/mobject/session.hpp

@@ -35,7 +35,7 @@
 
 #include "proc/mobject/placement.hpp"
 #include "proc/mobject/session/defsmanager.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <boost/noncopyable.hpp>
 #include <tr1/memory>

src/proc/mobject/session/defsmanager.cpp

@@ -23,7 +23,7 @@
 
 #include "proc/mobject/session/defsmanager.hpp"
 #include "proc/mobject/session/defsregistry.hpp"
-#include "common/configrules.hpp"
+#include "lib/configrules.hpp"
 #include "include/error.hpp"
 
 #include <boost/format.hpp>

src/proc/mobject/session/defsmanager.hpp

@@ -25,8 +25,8 @@
 #define MOBJECT_SESSION_DEFSMANAGER_H
 
 
-#include "common/p.hpp"
-#include "common/query.hpp"
+#include "lib/p.hpp"
+#include "lib/query.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>

src/proc/mobject/session/defsregistry.hpp

@@ -40,10 +40,10 @@
 #define MOBJECT_SESSION_DEFSREGISTRY_H
 
 
-#include "common/multithread.hpp"
-#include "common/query.hpp"
-#include "common/util.hpp"
-#include "common/p.hpp"
+#include "lib/multithread.hpp"
+#include "lib/query.hpp"
+#include "lib/util.hpp"
+#include "lib/p.hpp"
 
 #include <set>
 #include <vector>

src/proc/mobject/session/session.cpp

@@ -35,7 +35,7 @@
 #include "proc/mobject/session/defsmanager.hpp"
 #include "proc/mobject/session/sessionimpl.hpp"
 
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 
 using lumiera::Singleton;

src/proc/state.hpp

@@ -28,7 +28,7 @@
 #include "pre.hpp"
 
 #include "proc/common.hpp"
-#include "common/frameid.hpp"
+#include "lib/frameid.hpp"
 #include "proc/engine/buffhandle.hpp"
 
 #include <cstddef>