From c536915b2ea925f4b8bd7296e90506ccd7ec96d6 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@joel-desktop.(none)>
Date: Sat, 20 Dec 2008 15:55:46 +0000
Subject: [PATCH] Corrected errors introduced by the merge

---
 src/backend/Makefile.am        | 3 ++-
 src/gui/Makefile.am            | 2 +-
 src/gui/model/parent-track.hpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index a05e0e9b6..913c9d6f8 100644
--- a/src/backend/Makefile.am
+++ b/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 =					\
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 6fd571181..8468c566e 100644
--- a/src/gui/Makefile.am
+++ b/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									\
diff --git a/src/gui/model/parent-track.hpp b/src/gui/model/parent-track.hpp
index 518140d9f..bc697d903 100644
--- a/src/gui/model/parent-track.hpp
+++ b/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