Move cc-util into panels/common

We need this in some panels too.
This commit is contained in:
Rui Matos 2013-02-04 19:35:01 +01:00
parent fbbb0b1fd8
commit cfa16a070d
6 changed files with 9 additions and 4 deletions

View file

@ -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 \

View file

@ -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)

View file

@ -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"

View file

@ -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 \