From 303308e397f409e3c74be72eaf307efc2a7cb832 Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Sat, 17 Dec 2011 15:20:29 -0500 Subject: [PATCH] WIP move all conf components into conf dir --- Makefile.am | 22 +------------- conf/Makefile.am | 47 +++++++++++++++++++++++++++++ {dconf => conf/dconf}/Makefile.am | 0 {dconf => conf/dconf}/config.c | 0 {dconf => conf/dconf}/config.h | 0 {dconf => conf/dconf}/dconf.xml.in.in | 0 {dconf => conf/dconf}/main.c | 0 {gconf => conf/gconf}/Makefile.am | 0 {gconf => conf/gconf}/config.c | 0 {gconf => conf/gconf}/config.h | 0 {gconf => conf/gconf}/gconf.xml.in.in | 0 {gconf => conf/gconf}/main.c | 0 {memconf => conf/memconf}/Makefile.am | 0 {memconf => conf/memconf}/config.c | 0 {memconf => conf/memconf}/config.h | 0 {memconf => conf/memconf}/main.c | 0 {memconf => conf/memconf}/memconf.xml.in.in | 0 configure.ac | 13 ++++---- 18 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 conf/Makefile.am rename {dconf => conf/dconf}/Makefile.am (100%) rename {dconf => conf/dconf}/config.c (100%) rename {dconf => conf/dconf}/config.h (100%) rename {dconf => conf/dconf}/dconf.xml.in.in (100%) rename {dconf => conf/dconf}/main.c (100%) rename {gconf => conf/gconf}/Makefile.am (100%) rename {gconf => conf/gconf}/config.c (100%) rename {gconf => conf/gconf}/config.h (100%) rename {gconf => conf/gconf}/gconf.xml.in.in (100%) rename {gconf => conf/gconf}/main.c (100%) rename {memconf => conf/memconf}/Makefile.am (100%) rename {memconf => conf/memconf}/config.c (100%) rename {memconf => conf/memconf}/config.h (100%) rename {memconf => conf/memconf}/main.c (100%) rename {memconf => conf/memconf}/memconf.xml.in.in (100%) diff --git a/Makefile.am b/Makefile.am index ce478cf..b384c0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,33 +33,16 @@ PYTHON_DIRS = \ $(NULL) endif -if ENABLE_GCONF -GCONF_DIR = \ - gconf \ - $(NULL) -endif - if ENABLE_DAEMON DAEMON_DIR = \ bus \ $(NULL) endif -if ENABLE_MEMCONF -MEMCONF_DIR = \ - memconf \ - $(NULL) -endif - -if ENABLE_DCONF -DCONF_DIR = \ - dconf \ - $(NULL) -endif - SUBDIRS = \ src \ util \ + conf \ client \ engine \ tools \ @@ -70,9 +53,6 @@ SUBDIRS = \ bindings \ $(UI_DIR) \ $(DAEMON_DIR) \ - $(GCONF_DIR) \ - $(MEMCONF_DIR) \ - $(DCONF_DIR) \ $(PYTHON_DIRS) \ $(NULL) diff --git a/conf/Makefile.am b/conf/Makefile.am new file mode 100644 index 0000000..86127b2 --- /dev/null +++ b/conf/Makefile.am @@ -0,0 +1,47 @@ +# vim:set noet ts=4: +# +# ibus - The Input Bus +# +# Copyright (c) 2007-2010 Peng Huang +# Copyright (c) 2007-2010 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place, Suite 330, +# Boston, MA 02111-1307 USA + +if ENABLE_GCONF +GCONF_DIR = \ + gconf \ + $(NULL) +endif + +if ENABLE_MEMCONF +MEMCONF_DIR = \ + memconf \ + $(NULL) +endif + +if ENABLE_DCONF +DCONF_DIR = \ + dconf \ + $(NULL) +endif + +SUBDIRS = \ + $(DCONF_DIR) \ + $(GCONF_DIR) \ + $(MEMCONF_DIR) \ + $(NULL) + +-include $(top_srcdir)/git.mk diff --git a/dconf/Makefile.am b/conf/dconf/Makefile.am similarity index 100% rename from dconf/Makefile.am rename to conf/dconf/Makefile.am diff --git a/dconf/config.c b/conf/dconf/config.c similarity index 100% rename from dconf/config.c rename to conf/dconf/config.c diff --git a/dconf/config.h b/conf/dconf/config.h similarity index 100% rename from dconf/config.h rename to conf/dconf/config.h diff --git a/dconf/dconf.xml.in.in b/conf/dconf/dconf.xml.in.in similarity index 100% rename from dconf/dconf.xml.in.in rename to conf/dconf/dconf.xml.in.in diff --git a/dconf/main.c b/conf/dconf/main.c similarity index 100% rename from dconf/main.c rename to conf/dconf/main.c diff --git a/gconf/Makefile.am b/conf/gconf/Makefile.am similarity index 100% rename from gconf/Makefile.am rename to conf/gconf/Makefile.am diff --git a/gconf/config.c b/conf/gconf/config.c similarity index 100% rename from gconf/config.c rename to conf/gconf/config.c diff --git a/gconf/config.h b/conf/gconf/config.h similarity index 100% rename from gconf/config.h rename to conf/gconf/config.h diff --git a/gconf/gconf.xml.in.in b/conf/gconf/gconf.xml.in.in similarity index 100% rename from gconf/gconf.xml.in.in rename to conf/gconf/gconf.xml.in.in diff --git a/gconf/main.c b/conf/gconf/main.c similarity index 100% rename from gconf/main.c rename to conf/gconf/main.c diff --git a/memconf/Makefile.am b/conf/memconf/Makefile.am similarity index 100% rename from memconf/Makefile.am rename to conf/memconf/Makefile.am diff --git a/memconf/config.c b/conf/memconf/config.c similarity index 100% rename from memconf/config.c rename to conf/memconf/config.c diff --git a/memconf/config.h b/conf/memconf/config.h similarity index 100% rename from memconf/config.h rename to conf/memconf/config.h diff --git a/memconf/main.c b/conf/memconf/main.c similarity index 100% rename from memconf/main.c rename to conf/memconf/main.c diff --git a/memconf/memconf.xml.in.in b/conf/memconf/memconf.xml.in.in similarity index 100% rename from memconf/memconf.xml.in.in rename to conf/memconf/memconf.xml.in.in diff --git a/configure.ac b/configure.ac index c8fd274..fa189a7 100644 --- a/configure.ac +++ b/configure.ac @@ -446,8 +446,6 @@ Makefile ibus-1.0.pc ibus.spec xinput-ibus -memconf/Makefile -memconf/memconf.xml.in client/Makefile client/gtk2/Makefile client/gtk3/Makefile @@ -479,12 +477,15 @@ ui/gtk2/gtkpanel.xml.in ui/gtk3/Makefile setup/Makefile setup/ibus-setup -gconf/Makefile -gconf/gconf.xml.in bindings/Makefile bindings/vala/Makefile -dconf/Makefile -dconf/dconf.xml.in +conf/Makefile +conf/gconf/Makefile +conf/gconf/gconf.xml.in +conf/dconf/Makefile +conf/dconf/dconf.xml.in +conf/memconf/Makefile +conf/memconf/memconf.xml.in tools/Makefile ]) -- 2.7.4