[gnome-control-center/extensible-shell] Move CcShell object into libgnome-control-center-extension



commit c2a7f0106afde2153629994c9d7ab6ecdba84235
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Mar 17 14:21:37 2010 +0000

    Move CcShell object into libgnome-control-center-extension
    
    The CcShell object needs to be in libgnome-control-center-extension so that
    its symbols can be resolved by applications and libraries using
    libgnome-control-center-extension.

 libgnome-control-center-extension/Makefile.am      |    3 +++
 .../cc-shell.c                                     |    0
 shell/Makefile.am                                  |    1 -
 3 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/libgnome-control-center-extension/Makefile.am b/libgnome-control-center-extension/Makefile.am
index fde871b..da3038f 100644
--- a/libgnome-control-center-extension/Makefile.am
+++ b/libgnome-control-center-extension/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 INCLUDES =						\
+	-DEXTENSIONSDIR="\"$(EXTENSIONSDIR)\""			\
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
 	-DLIBEXECDIR="\"$(libexecdir)\""				\
@@ -31,6 +32,8 @@ libgnome_control_center_extension_la_SOURCES =		\
 	cc-page.c					\
 	cc-panel.h					\
 	cc-panel.c					\
+	cc-shell.c					\
+	cc-shell.h					\
 	$(NULL)
 
 #        -version-info @GNOME_CONTROL_CENTER_EXTENSION_VERSION_INFO@
diff --git a/shell/cc-shell.c b/libgnome-control-center-extension/cc-shell.c
similarity index 100%
rename from shell/cc-shell.c
rename to libgnome-control-center-extension/cc-shell.c
diff --git a/shell/Makefile.am b/shell/Makefile.am
index ca61413..7dbeeac 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -11,7 +11,6 @@ bin_PROGRAMS = gnome-control-center
 
 gnome_control_center_SOURCES =			\
 	control-center.c			\
-	cc-shell.c				\
 	shell-search-renderer.c			\
 	shell-search-renderer.h			\
 	$(NULL)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]