moved the config system and interfaces/plugins back to lib

in preparation for the shared lib transistion doing next

src/backend/backend.c

@@ -22,7 +22,7 @@
 #include "lib/safeclib.h"
 
 #include "backend/backend.h"
-#include "lumiera/config.h"
+#include "lib/config.h"
 #include "backend/filehandlecache.h"
 #include "backend/filedescriptor.h"
 #include "backend/mmapcache.h"

src/backend/mmap.c

@@ -23,7 +23,7 @@
 
 #include "backend/mmap.h"
 #include "backend/mmapcache.h"
-#include "lumiera/config.h"
+#include "lib/config.h"
 
 #include <unistd.h>
 #include <sys/mman.h>

src/gui/gtk-lumiera.cpp

@@ -33,7 +33,7 @@
 #include "model/project.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 }
 
 NOBUG_CPP_DEFINE_FLAG(gui);

src/gui/guifacade.hpp

@@ -41,7 +41,7 @@
 #include "lumiera/subsys.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 }
 
 

src/guistart.cpp

@@ -48,8 +48,8 @@
 #include "common/singleton.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
-#include "lumiera/interfacedescriptor.h"
+#include "lib/interface.h"
+#include "lib/interfacedescriptor.h"
 }
 
 #include <string>

src/include/guinotificationfacade.h

@@ -86,7 +86,7 @@ extern "C" {
 #endif /* =========================== CLI Interface ================= */ 
 
   
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 LUMIERA_INTERFACE_DECLARE (lumieraorg_GuiNotification, 1,
                            LUMIERA_INTERFACE_SLOT (void, displayInfo,        (const char*)),

src/lib/Makefile.am

@@ -18,7 +18,7 @@
 liblumiera_a_srcdir = $(top_srcdir)/src/lib
 noinst_LIBRARIES += liblumiera.a
 
-liblumiera_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
+liblumiera_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\""
 
 liblumiera_a_SOURCES =					\
 	$(liblumiera_a_srcdir)/error.c			\
@@ -31,6 +31,17 @@ liblumiera_a_SOURCES =					\
 	$(liblumiera_a_srcdir)/psplay.c			\
 	$(liblumiera_a_srcdir)/mrucache.c		\
 	$(liblumiera_a_srcdir)/time.c			\
+	$(liblumiera_a_srcdir)/config.c			\
+	$(liblumiera_a_srcdir)/config_typed.c		\
+	$(liblumiera_a_srcdir)/config_wordlist.c	\
+	$(liblumiera_a_srcdir)/configentry.c		\
+	$(liblumiera_a_srcdir)/configitem.c		\
+	$(liblumiera_a_srcdir)/config_lookup.c		\
+	$(liblumiera_a_srcdir)/config_interface.c	\
+	$(liblumiera_a_srcdir)/interface.c		\
+	$(liblumiera_a_srcdir)/interfaceregistry.c	\
+	$(liblumiera_a_srcdir)/plugin.c			\
+	$(liblumiera_a_srcdir)/plugin_dynlib.c		\
 	$(liblumiera_a_srcdir)/allocationcluster.cpp	\
 	$(liblumiera_a_srcdir)/external/libgavl.cpp	\
 	$(liblumiera_a_srcdir)/cmdline.cpp
@@ -47,6 +58,15 @@ noinst_HEADERS +=					\
 	$(liblumiera_a_srcdir)/mrucache.h		\
 	$(liblumiera_a_srcdir)/time.h			\
 	$(liblumiera_a_srcdir)/ppmpl.h			\
+	$(liblumiera_a_srcdir)/interface.h		\
+	$(liblumiera_a_srcdir)/interfaceregistry.h	\
+	$(liblumiera_a_srcdir)/interfacedescriptor.h	\
+	$(liblumiera_a_srcdir)/plugin.h			\
+	$(liblumiera_a_srcdir)/config.h			\
+	$(liblumiera_a_srcdir)/configentry.h		\
+	$(liblumiera_a_srcdir)/configitem.h		\
+	$(liblumiera_a_srcdir)/config_lookup.h		\
+	$(liblumiera_a_srcdir)/config_interface.h	\
 	$(liblumiera_a_srcdir)/allocationcluster.hpp	\
 	$(liblumiera_a_srcdir)/scopedholdertransfer.hpp	\
 	$(liblumiera_a_srcdir)/scopedholder.hpp		\

src/lib/config.c

@@ -21,10 +21,10 @@
 
 //TODO: Support library includes//
 #include "lib/safeclib.h"
+#include "lib/config.h"
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config.h"
 
 //TODO: internal/static forward declarations//
 

src/lib/config.h

@@ -51,8 +51,8 @@ LUMIERA_ERROR_DECLARE (CONFIG_NO_ENTRY);
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config_lookup.h"
-#include "lumiera/configitem.h"
+#include "lib/config_lookup.h"
+#include "lib/configitem.h"
 
 //TODO: System includes//
 #include <nobug.h>

src/lib/config_interface.c

@@ -23,8 +23,8 @@
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config_interface.h"
-#include "lumiera/config.h"
+#include "lib/config_interface.h"
+#include "lib/config.h"
 
 //TODO: internal/static forward declarations//
 
@@ -140,7 +140,7 @@ LUMIERA_EXPORT(
 
 #ifndef LUMIERA_PLUGIN
 
-#include "lumiera/interfaceregistry.h"
+#include "lib/interfaceregistry.h"
 void
 lumiera_config_interface_init (void)
 {

src/lib/config_interface.h

@@ -24,7 +24,7 @@
 
 //TODO: Support library includes//
 
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 //TODO: Forward declarations//
 

src/lib/config_lookup.c

@@ -20,8 +20,8 @@
 */
 #include "lib/safeclib.h"
 
-#include "lumiera/config_lookup.h"
-#include "lumiera/config.h"
+#include "lib/config_lookup.h"
+#include "lib/config.h"
 
 /* we only use one fatal error for now, when allocation in the config system fail, something else is pretty wrong */
 LUMIERA_ERROR_DEFINE (CONFIG_LOOKUP, "config lookup failure");

src/lib/config_lookup.h

@@ -33,7 +33,7 @@ typedef struct lumiera_config_lookupentry_struct lumiera_config_lookupentry;
 typedef lumiera_config_lookupentry* LumieraConfigLookupentry;
 
 
-#include "lumiera/configitem.h"
+#include "lib/configitem.h"
 
 
 #include <nobug.h>

src/lib/config_typed.c

@@ -24,7 +24,7 @@
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config.h"
+#include "lib/config.h"
 
 //TODO: internal/static forward declarations//
 extern LumieraConfig lumiera_global_config;

src/lib/config_wordlist.c

@@ -23,7 +23,7 @@
 #include "lib/safeclib.h"
 
 
-#include "lumiera/config.h"
+#include "lib/config.h"
 
 extern LumieraConfig lumiera_global_config;
 

src/lib/configentry.c

@@ -23,7 +23,7 @@
 #include "lib/safeclib.h"
 
 //TODO: Lumiera header includes//
-#include "lumiera/configentry.h"
+#include "lib/configentry.h"
 
 //TODO: internal/static forward declarations//
 

src/lib/configentry.h

@@ -31,7 +31,7 @@ typedef lumiera_configentry* LumieraConfigentry;
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/configitem.h"
+#include "lib/configitem.h"
 
 //TODO: System includes//
 #include <nobug.h>

src/lib/configitem.c

@@ -25,9 +25,9 @@
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config.h"
-#include "lumiera/configitem.h"
-#include "lumiera/configentry.h"
+#include "lib/config.h"
+#include "lib/configitem.h"
+#include "lib/configentry.h"
 
 
 static LumieraConfigitem parse_directive (LumieraConfigitem self, char* itr);

src/lib/configitem.h

@@ -33,7 +33,7 @@ typedef lumiera_configitem* LumieraConfigitem;
 struct lumiera_configitem_vtable;
 
 //TODO: Lumiera header includes//
-#include "lumiera/config_lookup.h"
+#include "lib/config_lookup.h"
 
 
 //TODO: System includes//

src/lib/interface.c

@@ -22,10 +22,10 @@
 #include "lib/mutex.h"
 #include "lib/safeclib.h"
 
-#include "lumiera/plugin.h"
-#include "lumiera/interface.h"
+#include "lib/plugin.h"
+#include "lib/interface.h"
 
-#include "lumiera/interfaceregistry.h"
+#include "lib/interfaceregistry.h"
 
 #include <nobug.h>
 

src/lib/interfacedescriptor.h

@@ -21,7 +21,7 @@
 #ifndef LUMIERA_INTERFACEDESCRIPTOR_H
 #define LUMIERA_INTERFACEDESCRIPTOR_H
 
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 
 /**

src/lib/interfaceregistry.c

@@ -29,8 +29,8 @@
 
 
 
-#include "lumiera/plugin.h"
-#include "lumiera/interfaceregistry.h"
+#include "lib/plugin.h"
+#include "lib/interfaceregistry.h"
 
 /**
  * @file

src/lib/interfaceregistry.h

@@ -24,8 +24,8 @@
 #include "lib/mutex.h"
 #include "lib/psplay.h"
 
-#include "lumiera/interface.h"
-#include "lumiera/plugin.h"
+#include "lib/interface.h"
+#include "lib/plugin.h"
 
 #include <nobug.h>
 

src/lib/plugin.c

@@ -25,9 +25,9 @@
 #include "lib/mutex.h"
 #include "lib/error.h"
 
-#include "lumiera/interfaceregistry.h"
-#include "lumiera/config.h"
-#include "lumiera/plugin.h"
+#include "lib/interfaceregistry.h"
+#include "lib/config.h"
+#include "lib/plugin.h"
 
 #include <glob.h>
 

src/lib/plugin.h

@@ -24,7 +24,7 @@
 #include "lib/psplay.h"
 #include "lib/error.h"
 
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 #include <stdlib.h>
 #include <nobug.h>

src/lib/plugin_dynlib.c

@@ -18,7 +18,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "lumiera/plugin.h"
+#include "lib/plugin.h"
 
 #include <dlfcn.h>
 #include <nobug.h>

src/lumiera/Makefile.am

@@ -19,21 +19,10 @@ lumiera_srcdir = $(top_srcdir)/src/lumiera
 
 
 noinst_LIBRARIES += liblumieracore.a
-liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\"" -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
+liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
 liblumieracore_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
 
 liblumieracore_a_SOURCES =			\
-	$(lumiera_srcdir)/config.c		\
-	$(lumiera_srcdir)/config_typed.c	\
-	$(lumiera_srcdir)/config_wordlist.c	\
-	$(lumiera_srcdir)/configentry.c		\
-	$(lumiera_srcdir)/configitem.c		\
-	$(lumiera_srcdir)/config_lookup.c	\
-	$(lumiera_srcdir)/config_interface.c	\
-	$(lumiera_srcdir)/interface.c		\
-	$(lumiera_srcdir)/interfaceregistry.c	\
-	$(lumiera_srcdir)/plugin.c		\
-	$(lumiera_srcdir)/plugin_dynlib.c	\
 	$(lumiera_srcdir)/guifacade.cpp		\
 	$(lumiera_srcdir)/configfacade.cpp	\
 	$(lumiera_srcdir)/appstate.cpp		\
@@ -56,15 +45,6 @@ lumiera_SOURCES =				\
 
 
 noinst_HEADERS +=				\
-	$(lumiera_srcdir)/interface.h		\
-	$(lumiera_srcdir)/interfaceregistry.h	\
-	$(lumiera_srcdir)/interfacedescriptor.h	\
-	$(lumiera_srcdir)/plugin.h		\
-	$(lumiera_srcdir)/config.h		\
-	$(lumiera_srcdir)/configentry.h		\
-	$(lumiera_srcdir)/configitem.h		\
-	$(lumiera_srcdir)/config_lookup.h	\
-	$(lumiera_srcdir)/config_interface.h	\
 	$(lumiera_srcdir)/subsys.hpp		\
 	$(lumiera_srcdir)/appstate.hpp		\
 	$(lumiera_srcdir)/option.hpp		\

src/lumiera/appstate.cpp

@@ -28,11 +28,11 @@
 #include "lumiera/subsystemrunner.hpp"
 
 extern "C" {
-#include "lumiera/config_interface.h"
+#include "lib/config_interface.h"
 
-#include "lumiera/interface.h"
-#include "lumiera/interfaceregistry.h"
-#include "lumiera/plugin.h"
+#include "lib/interface.h"
+#include "lib/interfaceregistry.h"
+#include "lib/plugin.h"
 }
 
 #include "common/util.hpp"

src/lumiera/instancehandle.hpp

@@ -42,8 +42,8 @@
 #include "include/nobugcfg.h"
 
 extern "C" {
-#include "lumiera/interface.h"
-#include "lumiera/interfaceregistry.h"
+#include "lib/interface.h"
+#include "lib/interfaceregistry.h"
 }
 
 #include <boost/noncopyable.hpp>

src/lumiera/interfaceproxy.cpp

@@ -27,7 +27,7 @@
 #include "include/error.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 }
 
 using util::cStr;