Corrected errors introduced by the merge

src/backend/Makefile.am

@@ -19,7 +19,8 @@ liblumierabackend_la_srcdir = $(top_srcdir)/src/backend
 lib_LTLIBRARIES += liblumierabackend.la
 
 liblumierabackend_la_CPPFLAGS = $(AM_CPPFLAGS)
-liblumierabackend_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
+liblumierabackend_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall
+#liblumierabackend_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
 liblumierabackend_la_LIBADD = liblumiera.la
 
 liblumierabackend_la_SOURCES =					\

src/gui/Makefile.am

@@ -82,7 +82,7 @@ libgui_la_CPPFLAGS = $(AM_CPPFLAGS)					\
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"				\
 	$(LUMIERA_GUI_CFLAGS)
 
-lumigui_SOURCES =															\
+libgui_la_SOURCES =															\
 	$(lumigui_srcdir)/gtk-lumiera.cpp										\
 	$(lumigui_srcdir)/gtk-lumiera.hpp										\
 	$(lumigui_srcdir)/window-manager.cpp									\

src/gui/model/parent-track.hpp

@@ -26,7 +26,7 @@
  */
 
 #include "track.hpp"
-#include "../../common/observable-list.hpp"
+#include "../../lib/observable-list.hpp"
 
 #ifndef PARENT_TRACK_HPP
 #define PARENT_TRACK_HPP