[libslab] Use a single include.

[Federico Mena Quintero <federico src gnome org>]

commit e7493b933cc1139f471cccae200f4f5c96f61fa6
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Jul 1 12:51:12 2009 +0200

    Use a single include.
    
    This eases usage of the library for clients.
    Also, install the library in $includedir/libslab instead of
    $includedir/slab to be consistent with the library name.

 libslab.pc.in              |    2 +-
 libslab/Makefile.am        |   15 +++++++++----
 libslab/app-resizer.h      |    2 +
 libslab/app-shell.h        |    4 +-
 libslab/application-tile.h |    2 +-
 libslab/directory-tile.h   |    2 +-
 libslab/nameplate-tile.h   |    2 +-
 libslab/shell-window.h     |    3 +-
 libslab/slab.h             |   45 ++++++++++++++++++++++++++++++++++++++++++++
 libslab/system-tile.h      |    2 +-
 10 files changed, 66 insertions(+), 13 deletions(-)
---
diff --git a/libslab.pc.in b/libslab.pc.in
index f2c614c..a468f98 100644
--- a/libslab.pc.in
+++ b/libslab.pc.in
@@ -9,4 +9,4 @@ Requires: glib-2.0 gobject-2.0 gtk+-2.0 gnome-desktop-2.0 libgnome-menu gconf-2.
 Requires.private: gdk-2.0 librsvg-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lslab
-Cflags: -I${includedir}/slab
+Cflags: -I${includedir}/libslab
diff --git a/libslab/Makefile.am b/libslab/Makefile.am
index 723b428..e684deb 100644
--- a/libslab/Makefile.am
+++ b/libslab/Makefile.am
@@ -2,14 +2,18 @@ INCLUDES =					\
 	$(LIBSLAB_CFLAGS)			\
 	$(WARN_CFLAGS)
 
+
 HEADER_FILES=					\
 	$(BUILT_SOURCES)			\
 	app-resizer.h				\
 	app-shell.h				\
 	application-tile.h			\
+	bookmark-agent.h			\
 	directory-tile.h			\
 	document-tile.h				\
+	double-click-detector.h			\
 	gnome-utils.h				\
+	libslab-utils.h				\
 	nameplate-tile.h			\
 	search-bar.h				\
 	search-context-picker.h			\
@@ -27,15 +31,12 @@ libslab_la_SOURCES =				\
 	app-resizer.c				\
 	app-shell.c				\
 	application-tile.c			\
-	bookmark-agent.h			\
 	bookmark-agent.c			\
 	directory-tile.c			\
 	document-tile.c				\
 	double-click-detector.c			\
-	double-click-detector.h			\
 	gnome-utils.c				\
 	libslab-utils.c				\
-	libslab-utils.h				\
 	nameplate-tile.c			\
 	search-bar.c				\
 	search-context-picker.c			\
@@ -50,8 +51,12 @@ libslab_la_SOURCES =				\
 	tile-action.c				\
 	tile.c
 
-libslab_includedir = $(includedir)/slab
-libslab_include_HEADERS = $(HEADER_FILES)
+libslab_includedir = $(includedir)/libslab
+libslab_include_HEADERS = slab.h
+
+libslab_subincludedir = $(includedir)/libslab/libslab
+libslab_subinclude_HEADERS = $(HEADER_FILES)
+
 libslab_la_LDFLAGS = -version-info $(LT_VERSION)
 
 libslab_la_LIBADD = $(LIBSLAB_LIBS)
diff --git a/libslab/app-resizer.h b/libslab/app-resizer.h
index b84cfb9..690d7ae 100644
--- a/libslab/app-resizer.h
+++ b/libslab/app-resizer.h
@@ -24,6 +24,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
+#include <libslab/app-shell.h>
+
 G_BEGIN_DECLS
 
 #define INITIAL_NUM_COLS 3
diff --git a/libslab/app-shell.h b/libslab/app-shell.h
index 98b502f..10e365a 100644
--- a/libslab/app-shell.h
+++ b/libslab/app-shell.h
@@ -26,8 +26,8 @@
 #define GMENU_I_KNOW_THIS_IS_UNSTABLE
 #include <gmenu-tree.h>
 
-#include "slab-section.h"
-#include "tile.h"
+#include <libslab/slab-section.h>
+#include <libslab/tile.h>
 
 G_BEGIN_DECLS
 
diff --git a/libslab/application-tile.h b/libslab/application-tile.h
index 57a97d9..6df049f 100644
--- a/libslab/application-tile.h
+++ b/libslab/application-tile.h
@@ -21,7 +21,7 @@
 #ifndef __APPLICATION_TILE_H__
 #define __APPLICATION_TILE_H__
 
-#include "nameplate-tile.h"
+#include <libslab/nameplate-tile.h>
 
 #include <libgnome/gnome-desktop-item.h>
 
diff --git a/libslab/directory-tile.h b/libslab/directory-tile.h
index d6ef0d5..9c730fc 100644
--- a/libslab/directory-tile.h
+++ b/libslab/directory-tile.h
@@ -23,7 +23,7 @@
 
 #include <time.h>
 
-#include "nameplate-tile.h"
+#include <libslab/nameplate-tile.h>
 
 G_BEGIN_DECLS
 
diff --git a/libslab/nameplate-tile.h b/libslab/nameplate-tile.h
index c0b8c54..f6b338b 100644
--- a/libslab/nameplate-tile.h
+++ b/libslab/nameplate-tile.h
@@ -21,7 +21,7 @@
 #ifndef __NAMEPLATE_TILE_H__
 #define __NAMEPLATE_TILE_H__
 
-#include "tile.h"
+#include <libslab/tile.h>
 
 #include <gtk/gtk.h>
 
diff --git a/libslab/shell-window.h b/libslab/shell-window.h
index 88c1b1a..54124c0 100644
--- a/libslab/shell-window.h
+++ b/libslab/shell-window.h
@@ -24,7 +24,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <libgnome/gnome-desktop-item.h>
-#include "app-shell.h"
+
+#include <libslab/app-shell.h>
 
 G_BEGIN_DECLS
 
diff --git a/libslab/slab.h b/libslab/slab.h
new file mode 100644
index 0000000..b550fc7
--- /dev/null
+++ b/libslab/slab.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of libslab.
+ *
+ * Copyright (c) 2006 Novell, Inc.
+ *
+ * Libslab is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * Libslab is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libslab; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+
+#ifndef __SLAB_H__
+#define __SLAB_H__
+
+#include <libslab/app-resizer.h>
+#include <libslab/app-shell.h>
+#include <libslab/application-tile.h>
+#include <libslab/bookmark-agent.h>
+#include <libslab/directory-tile.h>
+#include <libslab/document-tile.h>
+#include <libslab/double-click-detector.h>
+#include <libslab/gnome-utils.h>
+#include <libslab/libslab-utils.h>
+#include <libslab/nameplate-tile.h>
+#include <libslab/search-bar.h>
+#include <libslab/search-context-picker.h>
+#include <libslab/search-entry.h>
+#include <libslab/shell-window.h>
+#include <libslab/slab-gnome-util.h>
+#include <libslab/slab-section.h>
+#include <libslab/system-tile.h>
+#include <libslab/tile.h>
+
+#endif /* __SLAB_H__ */
+
diff --git a/libslab/system-tile.h b/libslab/system-tile.h
index 270a7a1..40ee87e 100644
--- a/libslab/system-tile.h
+++ b/libslab/system-tile.h
@@ -21,7 +21,7 @@
 #ifndef __SYSTEM_TILE_H__
 #define __SYSTEM_TILE_H__
 
-#include "nameplate-tile.h"
+#include <libslab/nameplate-tile.h>
 
 #include <libgnome/gnome-desktop-item.h>