[gnome-control-center/wip/libgnome-control-center: 3/3] Remove libslab requirement and the internal copy of libslab

[Thomas Wood <thos src gnome org>]

commit 799134a7babf46d5d759e90f1051e84ad7c99c19
Author: Thomas Wood <thomas wood intel com>
Date:   Wed May 19 11:19:34 2010 +0100

    Remove libslab requirement and the internal copy of libslab
    
    libslab is no longer required since the new shell does not use it.

 Makefile.am                        |   14 +-
 configure.ac                       |   27 -
 libslab/.gitignore                 |   15 -
 libslab/Makefile.am                |   98 ---
 libslab/app-resizer.c              |  315 --------
 libslab/app-resizer.h              |   72 --
 libslab/app-shell.c                | 1409 ------------------------------------
 libslab/app-shell.h                |  141 ----
 libslab/application-tile.c         |  886 ----------------------
 libslab/application-tile.h         |   66 --
 libslab/bookmark-agent.c           | 1238 -------------------------------
 libslab/bookmark-agent.h           |   89 ---
 libslab/directory-tile.c           |  669 -----------------
 libslab/directory-tile.h           |   57 --
 libslab/document-tile.c            | 1099 ----------------------------
 libslab/document-tile.h            |   63 --
 libslab/double-click-detector.c    |   85 ---
 libslab/double-click-detector.h    |   58 --
 libslab/gnome-utils.c              |  346 ---------
 libslab/gnome-utils.h              |   40 -
 libslab/libslab-utils.c            |  716 ------------------
 libslab/libslab-utils.h            |   42 --
 libslab/nameplate-tile.c           |  290 --------
 libslab/nameplate-tile.h           |   55 --
 libslab/nld-marshal.list           |    1 -
 libslab/recent-files.c             |  294 --------
 libslab/recent-files.h             |   80 --
 libslab/search-bar.c               |  361 ---------
 libslab/search-bar.h               |   72 --
 libslab/search-context-picker.c    |  196 -----
 libslab/search-context-picker.h    |   58 --
 libslab/search-entry-watermark.svg |   58 --
 libslab/search-entry.c             |  145 ----
 libslab/search-entry.h             |   50 --
 libslab/shell-window.c             |  148 ----
 libslab/shell-window.h             |   65 --
 libslab/slab-gnome-util.c          |  471 ------------
 libslab/slab-gnome-util.h          |   76 --
 libslab/slab-section.c             |  194 -----
 libslab/slab-section.h             |   71 --
 libslab/slab.h                     |   45 --
 libslab/system-tile.c              |  285 --------
 libslab/system-tile.h              |   53 --
 libslab/themed-icon.c              |  165 -----
 libslab/themed-icon.h              |   53 --
 libslab/tile-action.c              |  108 ---
 libslab/tile.c                     |  621 ----------------
 libslab/tile.h                     |  143 ----
 48 files changed, 3 insertions(+), 11700 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 866da2d..4ecf918 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,6 @@
-SUBDIRS = po libwindow-settings libgnome-control-center capplets font-viewer \
-	  help docs
-DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break
-
-if HAVE_LIBSLAB_DEPS
-SUBDIRS += libslab
-endif
-
-if HAVE_LIBSLAB
-SUBDIRS += shell
-endif
+SUBDIRS = po libwindow-settings libgnome-control-center shell capplets \
+	  font-viewer help docs
+DIST_SUBDIRS = po libwindow-settings capplets font-viewer help shell typing-break
 
 if HAVE_TYPING_BREAK
 SUBDIRS += typing-break
diff --git a/configure.ac b/configure.ac
index 96390eb..9760386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,32 +142,6 @@ AC_SUBST(GTK_ENGINE_DIR)
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 
 dnl
-dnl Check dependencies of libslab
-dnl
-PKG_CHECK_MODULES(EXTERNAL_LIBSLAB, [libslab], have_libslab=yes, have_libslab=no)
-
-if test $have_libslab = no; then
-	PKG_CHECK_MODULES(LIBSLAB, [
-				   gio-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango gconf-2.0
-				   ],
-				   have_libslab_deps=yes,
-				   have_libslab_deps=no)
-	WARN_CFLAGS="-Wall"
-else
-	have_libslab_deps=no
-fi
-
-AC_SUBST(EXTERNAL_LIBSLAB_CFLAGS)
-AC_SUBST(EXTERNAL_LIBSLAB_LIBS)
-AC_SUBST(LIBSLAB_CFLAGS)
-AC_SUBST(LIBSLAB_LIBS)
-AC_SUBST(WARN_CFLAGS)
-
-AM_CONDITIONAL(HAVE_LIBSLAB, [test $have_libslab = yes -o $have_libslab_deps = yes])
-AM_CONDITIONAL(HAVE_LIBSLAB_DEPS, [test $have_libslab_deps = yes])
-AM_CONDITIONAL(LIBSLAB_FOR_INTERNAL_USE, test "yes" = "yes")
-
-dnl
 dnl Check for Xft version 2; we build in extra functionality to the font capplet
 dnl when we have it.
 dnl
@@ -366,7 +340,6 @@ libgnome-control-center/libgnome-control-center.pc
 libwindow-settings/Makefile
 libwindow-settings/gnome-window-settings-2.0.pc
 po/Makefile.in
-libslab/Makefile
 shell/Makefile
 shell/gnome-control-center.desktop.in
 typing-break/Makefile