[gnome-control-center/wip/region-panel: 27/39] Move cc-util into panels/common
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/region-panel: 27/39] Move cc-util into panels/common
- Date: Mon, 11 Feb 2013 11:15:36 +0000 (UTC)
commit 5388f2fec80aa1a5af41f305a8421ba5972a6f47
Author: Rui Matos <tiagomatos gmail com>
Date: Mon Feb 4 19:35:01 2013 +0100
Move cc-util into panels/common
We need this in some panels too.
panels/common/Makefile.am | 2 ++
{shell => panels/common}/cc-util.c | 0
{shell => panels/common}/cc-util.h | 0
shell/Makefile.am | 4 ++--
4 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am
index e262d3b..6655972 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
similarity index 100%
rename from shell/cc-util.c
rename to panels/common/cc-util.c
diff --git a/shell/cc-util.h b/panels/common/cc-util.h
similarity index 100%
rename from shell/cc-util.h
rename to panels/common/cc-util.h
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 024d671..81d85a3 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
@@ -33,8 +34,6 @@ gnome_control_center_SOURCES = \
cc-panel.h \
cc-shell.c \
cc-shell.h \
- cc-util.c \
- cc-util.h \
hostname-helper.c \
hostname-helper.h \
cc-hostname-entry.c \
@@ -47,6 +46,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 \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]