[gnome-main-menu] Remove static libslab

[Cosimo Cecchi <cosimoc src gnome org>]

commit e0b1c72abdc3c0817d399d60b9f484e6e119ee8c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Jul 1 12:18:21 2009 +0200

    Remove static libslab

 Makefile.am                         |    1 -
 application-browser/src/Makefile.am |    4 +-
 configure.in                        |   10 +-
 libslab/.cvsignore                  |    8 -
 libslab/ChangeLog                   |  248 ------
 libslab/Makefile.am                 |  105 ---
 libslab/app-resizer.c               |  342 ---------
 libslab/app-resizer.h               |   70 --
 libslab/app-shell-startup.c         |  123 ---
 libslab/app-shell-startup.h         |   37 -
 libslab/app-shell.c                 | 1407 -----------------------------------
 libslab/app-shell.h                 |  140 ----
 libslab/application-tile.c          |  882 ----------------------
 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             | 1093 ---------------------------
 libslab/document-tile.h             |   63 --
 libslab/double-click-detector.c     |  122 ---
 libslab/double-click-detector.h     |   58 --
 libslab/gnome-utils.c               |  346 ---------
 libslab/gnome-utils.h               |   40 -
 libslab/libslab-utils.c             |  695 -----------------
 libslab/libslab-utils.h             |   39 -
 libslab/libslab.pc.in               |   12 -
 libslab/nameplate-tile.c            |  291 --------
 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              |  187 -----
 libslab/shell-window.h              |   66 --
 libslab/slab-gnome-util.c           |  474 ------------
 libslab/slab-gnome-util.h           |   76 --
 libslab/slab-section.c              |  197 -----
 libslab/slab-section.h              |   71 --
 libslab/system-tile.c               |  286 -------
 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 ----
 main-menu/src/Makefile.am           |    4 +-
 53 files changed, 4 insertions(+), 12125 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b9a032a..b4e55b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,6 @@ NAUTILUS_DIR=
 endif
 
 SUBDIRS =				\
-	libslab				\
 	application-browser/etc		\
 	application-browser/src		\
 	main-menu/etc			\
diff --git a/application-browser/src/Makefile.am b/application-browser/src/Makefile.am
index 486d336..05e94e7 100644
--- a/application-browser/src/Makefile.am
+++ b/application-browser/src/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =							\
 	$(APPLICATION_BROWSER_CFLAGS)				\
-	-I$(top_srcdir)/libslab					\
 	$(WARN_CFLAGS)
 
 bin_PROGRAMS = application-browser
@@ -9,8 +8,7 @@ application_browser_SOURCES =					\
 	application-browser.c
 
 application_browser_LDADD =					\
-	$(APPLICATION_BROWSER_LIBS)				\
-	$(top_builddir)/libslab/libslab.la
+	$(APPLICATION_BROWSER_LIBS)
 
 AM_CPPFLAGS =							\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
diff --git a/configure.in b/configure.in
index 58ecadb..38ad90b 100644
--- a/configure.in
+++ b/configure.in
@@ -50,17 +50,13 @@ COMMON_MODULES="glib-2.0 >= $GLIB_REQUIRED	\
 		gio-2.0 >= $GLIB_REQUIRED 	\
 		gobject-2.0 			\
 		gtk+-2.0 >= $GTK_REQUIRED 	\
-		gdk-2.0"
+		gdk-2.0				\
+		libslab"
 
 PKG_CHECK_MODULES(GLADE, libglade-2.0)
 AC_SUBST(GLADE_CFLAGS)
 AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(LIBSLAB, [ $COMMON_MODULES libgnomeui-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango ])
-
-AC_SUBST(LIBSLAB_CFLAGS)
-AC_SUBST(LIBSLAB_LIBS)
-
 PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager libnm_glib >= 0.7.0 hal-storage cairo ])
 
 AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no)], have_iwlib=no)
@@ -180,8 +176,6 @@ AC_CONFIG_FILES([
 Makefile
 application-browser/etc/Makefile
 application-browser/src/Makefile
-libslab/Makefile
-libslab/libslab.pc
 main-menu/etc/Makefile
 main-menu/src/Makefile
 nautilus-main-menu/Makefile
diff --git a/main-menu/src/Makefile.am b/main-menu/src/Makefile.am
index f99502f..77ae71b 100644
--- a/main-menu/src/Makefile.am
+++ b/main-menu/src/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =								\
 	$(MAIN_MENU_CFLAGS)						\
-	-I$(top_srcdir)/libslab						\
 	$(WARN_CFLAGS)
 
 gladedir = $(datadir)/$(PACKAGE)
@@ -29,8 +28,7 @@ main_menu_SOURCES =							\
 
 main_menu_LDADD =							\
 	$(MAIN_MENU_LIBS)						\
-	$(GLADE_LIBS)							\
-	$(top_builddir)/libslab/libslab.la
+	$(GLADE_LIBS)
 
 trigger_panel_run_dialog_SOURCES =					\
 	trigger-panel-run-dialog.c