diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2013-02-04 19:35:01 +0100 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2013-02-19 12:25:54 +0100 |
| commit | cfa16a070de22207b93e2035d4f0528b1404e51b (patch) | |
| tree | 8de234c5b7e6545c818c3c56cf3130cb76dbc09f | |
| parent | fbbb0b1fd86c98ebfbe70de8b9c70c7751b0c0d6 (diff) | |
| download | gnome-control-center-cfa16a070de22207b93e2035d4f0528b1404e51b.tar.gz | |
Move cc-util into panels/common
We need this in some panels too.
| -rw-r--r-- | panels/common/Makefile.am | 2 | ||||
| -rw-r--r-- | panels/common/cc-util.c (renamed from shell/cc-util.c) | 0 | ||||
| -rw-r--r-- | panels/common/cc-util.h (renamed from shell/cc-util.h) | 0 | ||||
| -rw-r--r-- | search-provider/Makefile.am | 2 | ||||
| -rw-r--r-- | search-provider/cc-search-provider.c | 3 | ||||
| -rw-r--r-- | shell/Makefile.am | 6 |
6 files changed, 9 insertions, 4 deletions
diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am index e262d3b17..66559721d 100644 --- a/panels/common/Makefile.am +++ b/panels/common/Makefile.am @@ -13,6 +13,8 @@ BUILT_SOURCES = \ liblanguage_la_SOURCES = \ $(BUILT_SOURCES) \ + cc-util.c \ + cc-util.h \ cc-common-language.c \ cc-common-language.h \ cc-language-chooser.c \ diff --git a/shell/cc-util.c b/panels/common/cc-util.c index e51a9d2c0..e51a9d2c0 100644 --- a/shell/cc-util.c +++ b/panels/common/cc-util.c diff --git a/shell/cc-util.h b/panels/common/cc-util.h index 42b09ff2b..42b09ff2b 100644 --- a/shell/cc-util.h +++ b/panels/common/cc-util.h diff --git a/search-provider/Makefile.am b/search-provider/Makefile.am index 3ea315d2a..d0126a545 100644 --- a/search-provider/Makefile.am +++ b/search-provider/Makefile.am @@ -16,6 +16,7 @@ INCLUDES = \ -DCC_PANEL_LOADER_NO_GTYPES \ -I$(top_srcdir) \ $(SHELL_CFLAGS) \ + -I$(top_srcdir)/panels/common/ \ -I$(top_srcdir)/libgd libexec_PROGRAMS = gnome-control-center-search-provider @@ -32,6 +33,7 @@ gnome_control_center_search_provider_SOURCES = \ cc-search-provider.h gnome_control_center_search_provider_LDADD = \ + $(top_builddir)/panels/common/liblanguage.la \ $(top_builddir)/shell/libshell.la \ $(SHELL_LIBS) diff --git a/search-provider/cc-search-provider.c b/search-provider/cc-search-provider.c index ac92b7d9b..70d8642d1 100644 --- a/search-provider/cc-search-provider.c +++ b/search-provider/cc-search-provider.c @@ -28,7 +28,8 @@ #include <shell/cc-panel.h> #include <shell/cc-shell-model.h> #include <shell/cc-panel-loader.h> -#include <shell/cc-util.h> + +#include "cc-util.h" #include "control-center-search-provider.h" #include "cc-search-provider.h" diff --git a/shell/Makefile.am b/shell/Makefile.am index ffa5ea38f..f9f9070de 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -I$(top_srcdir) \ $(SHELL_CFLAGS) \ $(CHEESE_CFLAGS) \ + -I$(top_srcdir)/panels/common/ \ -I$(top_srcdir)/libgd all-local: check-local @@ -10,9 +11,7 @@ noinst_LTLIBRARIES = libshell.la libshell_la_SOURCES = \ cc-shell-model.c \ - cc-shell-model.h \ - cc-util.c \ - cc-util.h + cc-shell-model.h bin_PROGRAMS = gnome-control-center @@ -50,6 +49,7 @@ gnome_control_center_LDADD = \ $(SHELL_LIBS) \ $(CHEESE_LIBS) \ $(top_builddir)/libgd/libgd.la \ + $(top_builddir)/panels/common/liblanguage.la \ $(top_builddir)/panels/background/libbackground.la \ $(top_builddir)/panels/color/libcolor.la \ $(top_builddir)/panels/datetime/libdate_time.la \ |