From cd1914c1e8c42919b77e66755e4e6309e6a71f0d Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Sat, 2 Aug 2008 10:30:49 +0200
Subject: [PATCH] Make the project compile again without errors.

---
 libmmanager-gtk/Makefile.am | 2 +-
 src/mm-dbus-manager.c       | 5 +++--
 test/clients/Makefile.am    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libmmanager-gtk/Makefile.am b/libmmanager-gtk/Makefile.am
index 4f29eca..b00ea0b 100644
--- a/libmmanager-gtk/Makefile.am
+++ b/libmmanager-gtk/Makefile.am
@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libmmanager-gtk.la
 libmmanager_gtk_la_LIBADD =			\
 	$(MMEDIAMANAGER_LIBS)			\
 	$(GTK_LIBS)				\
-	$(top_builddir)/src/libmmanager.la
+	$(top_builddir)/libmmanager/libmmanager.la
 
 libmmanager_gtk_la_includedir=$(includedir)/libmmanager-gtk
 
diff --git a/src/mm-dbus-manager.c b/src/mm-dbus-manager.c
index dad2d2b..8a777df 100644
--- a/src/mm-dbus-manager.c
+++ b/src/mm-dbus-manager.c
@@ -23,9 +23,10 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
-#include "mm-error.h"
+
+#include "libmmanager/mm-error.h"
+#include "libmmanager/mm-type-builtins.h"
 #include "mm-dbus-manager.h"
-#include "mm-type-builtins.h"
 
 gboolean mm_dbus_manager_register_app (MMDBusManager *manager, char *path,
                                        char *name, GError **error);
diff --git a/test/clients/Makefile.am b/test/clients/Makefile.am
index fe6a2d2..377e8e2 100644
--- a/test/clients/Makefile.am
+++ b/test/clients/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
   -I. \
   -I$(srcdir) \
   -I$(top_srcdir)/src \
-  -I$(top_srcdir/libmmanager \
+  -I$(top_srcdir)/libmmanager \
   -I$(top_srcdir)/libmmanager-gtk \
   $(MMEDIAMANAGER_CFLAGS)
 
-- 
2.11.4.GIT