[gnome-control-center/standalone-libslab: 1/6] Remove references to the included libslab directory

[Federico Mena Quintero <federico src gnome org>]

commit b5143a4b55c59428ff6e1400d76f92a9e488fbd9
Author: Federico Mena Quintero <federico novell com>
Date:   Mon May 11 15:14:32 2009 -0500

    Remove references to the included libslab directory
    
    Signed-off-by: Federico Mena Quintero <federico novell com>
---
 ChangeLog         |    6 ++++++
 Makefile.am       |    2 +-
 configure.in      |    6 ------
 shell/ChangeLog   |    4 ++++
 shell/Makefile.am |    4 +---
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 364fd9c..c9a8015 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-11  Federico Mena Quintero  <federico novell com>
+
+	* configure.in: Remove references to the included libslab.
+
+	* Makefile.am: Remove the libslab directory.
+
 2009-05-07  Christian Persch  <chpe gnome org>
 
 	* font-viewer/ftstream-vfs.c: (vfs_stream_open): Safely printf
diff --git a/Makefile.am b/Makefile.am
index 54e636d..df485a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po libwindow-settings libslab capplets font-viewer shell help
+SUBDIRS = po libwindow-settings capplets font-viewer shell help
 
 if HAVE_TYPING_BREAK
 SUBDIRS += typing-break
diff --git a/configure.in b/configure.in
index 515f053..bcc7b0d 100644
--- a/configure.in
+++ b/configure.in
@@ -87,16 +87,12 @@ dnl ==============================================
 dnl Check that we meet the  dependencies
 dnl ==============================================
 
-ENABLE_DYNAMIC_LIBSLAB=0
-AM_CONDITIONAL(ENABLE_DYNAMIC_LIBSLAB, test "x$ENABLE_DYNAMIC_LIBSLAB" = "x1")
-
 COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl
  glib-2.0 >= 2.17.4 dnl
  gio-2.0 dnl
  gconf-2.0 dnl
  libglade-2.0 >= 2.0.0 dnl
  gnome-desktop-2.0 >= 2.25.1"
-PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango libgnomeui-2.0)
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
 PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0)
@@ -313,8 +309,6 @@ capplets/windows/window-properties.desktop.in
 font-viewer/Makefile
 font-viewer/gnome-font-viewer.desktop.in
 help/Makefile
-libslab/Makefile
-libslab/libslab.pc
 libwindow-settings/Makefile
 libwindow-settings/gnome-window-settings-2.0.pc
 po/Makefile.in
diff --git a/shell/ChangeLog b/shell/ChangeLog
index fab824d..0bdabb2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-11  Federico Mena Quintero  <federico novell com>
+
+	* Makefile.am: Remove references to the toplevel libslab.
+
 ==================== 2.25.90 ====================
 
 ==================== 2.25.3 ====================
diff --git a/shell/Makefile.am b/shell/Makefile.am
index ebeb850..155393f 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,5 +1,4 @@
 INCLUDES =					\
-	-I$(top_srcdir)/libslab			\
 	$(GNOMECC_SHELL_CFLAGS)
 
 bin_PROGRAMS = gnome-control-center 
@@ -8,8 +7,7 @@ gnome_control_center_SOURCES =		\
 	control-center.c
 
 gnome_control_center_LDADD =						\
-	$(GNOMECC_SHELL_LIBS)						\
-	$(top_builddir)/libslab/libslab.la
+	$(GNOMECC_SHELL_LIBS)
 
 AM_CPPFLAGS =							\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""