[gnome-control-center] shell: Merge libgnome-control-center into main binary

[Bastien Nocera <hadess src gnome org>]

commit 27c45abda3294239c7881a2ad878d9d1443f099a
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Nov 7 17:51:54 2011 +0000

    shell: Merge libgnome-control-center into main binary
    
    This fixes problems with the CcEditableEntry type not being
    registered and causing the printers and user-accounts panels not to
    work. As we do not need to work on Windows, we do not need to split
    out the library.

 Makefile.am                                        |    4 +-
 configure.ac                                       |    1 -
 libgnome-control-center/Makefile.am                |   31 --------------------
 shell/Makefile.am                                  |    8 ++++-
 .../cc-editable-entry.c                            |    0
 .../cc-editable-entry.h                            |    0
 {libgnome-control-center => shell}/cc-panel.c      |    0
 {libgnome-control-center => shell}/cc-panel.h      |    0
 {libgnome-control-center => shell}/cc-shell.c      |    0
 {libgnome-control-center => shell}/cc-shell.h      |    0
 shell/gnome-control-center.h                       |    2 +-
 11 files changed, 9 insertions(+), 37 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 56049e7..4931964 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = po libgnome-control-center shell panels help
-DIST_SUBDIRS = po help shell panels libgnome-control-center
+SUBDIRS = po shell panels help
+DIST_SUBDIRS = po help shell panels
 
 DISTCLEANFILES = \
 	gnome-doc-utils.make
diff --git a/configure.ac b/configure.ac
index a0247d2..130f900 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,7 +307,6 @@ fi
 AC_CONFIG_FILES([
 Makefile
 help/Makefile
-libgnome-control-center/Makefile
 panels/Makefile
 panels/common/Makefile
 panels/background/Makefile
diff --git a/shell/Makefile.am b/shell/Makefile.am
index a3a11af..5912e0c 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
-	-I$(top_srcdir)/libgnome-control-center \
 	$(SHELL_CFLAGS)
 
 bin_PROGRAMS = gnome-control-center
@@ -28,10 +27,15 @@ gnome_control_center_SOURCES =			\
 	cc-shell-item-view.h			\
 	cc-shell-model.c			\
 	cc-shell-model.h			\
+	cc-editable-entry.c			\
+	cc-editable-entry.h			\
+	cc-panel.c				\
+	cc-panel.h				\
+	cc-shell.c				\
+	cc-shell.h				\
 	$(MARSHAL_FILES)
 
 gnome_control_center_LDADD =			\
-	$(top_builddir)/libgnome-control-center/libgnome-control-center.la \
 	$(SHELL_LIBS)
 
 gnome_control_center_LDFLAGS = -export-dynamic
diff --git a/libgnome-control-center/cc-editable-entry.c b/shell/cc-editable-entry.c
similarity index 100%
rename from libgnome-control-center/cc-editable-entry.c
rename to shell/cc-editable-entry.c
diff --git a/libgnome-control-center/cc-editable-entry.h b/shell/cc-editable-entry.h
similarity index 100%
rename from libgnome-control-center/cc-editable-entry.h
rename to shell/cc-editable-entry.h
diff --git a/libgnome-control-center/cc-panel.c b/shell/cc-panel.c
similarity index 100%
rename from libgnome-control-center/cc-panel.c
rename to shell/cc-panel.c
diff --git a/libgnome-control-center/cc-panel.h b/shell/cc-panel.h
similarity index 100%
rename from libgnome-control-center/cc-panel.h
rename to shell/cc-panel.h
diff --git a/libgnome-control-center/cc-shell.c b/shell/cc-shell.c
similarity index 100%
rename from libgnome-control-center/cc-shell.c
rename to shell/cc-shell.c
diff --git a/libgnome-control-center/cc-shell.h b/shell/cc-shell.h
similarity index 100%
rename from libgnome-control-center/cc-shell.h
rename to shell/cc-shell.h
diff --git a/shell/gnome-control-center.h b/shell/gnome-control-center.h
index 50fe5af..30b3fb7 100644
--- a/shell/gnome-control-center.h
+++ b/shell/gnome-control-center.h
@@ -22,7 +22,7 @@
 #define _GNOME_CONTROL_CENTER_H
 
 #include <glib-object.h>
-#include <libgnome-control-center/cc-shell.h>
+#include "cc-shell.h"
 
 G_BEGIN_DECLS