From 9026db8da82df0229cd3c7f9055bccad338f6a91 Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Sat, 15 May 2010 20:02:19 +0800 Subject: [PATCH] Refine some build options. --- Makefile.am | 41 ++++++++++++++++++++++++++++------------- client/Makefile.am | 2 -- configure.ac | 14 +++++++------- gconf/Makefile.am | 2 -- ibus/Makefile.am | 2 -- ibus/interface/Makefile.am | 2 -- setup/Makefile.am | 2 -- ui/Makefile.am | 2 ++ ui/gtk/Makefile.am | 2 -- util/Makefile.am | 2 ++ 10 files changed, 39 insertions(+), 32 deletions(-) diff --git a/Makefile.am b/Makefile.am index 742f258..2d152c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,21 +20,36 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -SUBDIRS = \ - src \ - util \ - client \ - bus \ - data \ - m4 \ - po \ - docs \ - ibus \ - ui \ - setup \ - gconf \ +SUBDIRS = \ + src \ + util \ + bus \ + data \ + m4 \ + po \ + docs \ + ui \ $(NULL) +if ENABLE_CLIENT +SUBDIRS += \ + client \ + $(NULL) +endif + +if ENABLE_PYTHON +SUBDIRS += \ + ibus \ + setup \ + $(NULL) +endif + +if ENABLE_GCONF +SUBDIRS += \ + gconf \ + $(NULL) +endif + ACLOCAL_AMFLAGS = -I m4 pkgconfigdir = $(libdir)/pkgconfig diff --git a/client/Makefile.am b/client/Makefile.am index fb4e687..f0e298f 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -20,9 +20,7 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -if ENABLE_CLIENTS SUBDIRS = \ gtk2 \ x11 \ $(NULL) -endif diff --git a/configure.ac b/configure.ac index 508f58e..7d8bdc3 100644 --- a/configure.ac +++ b/configure.ac @@ -88,15 +88,15 @@ PKG_CHECK_MODULES(GTHREAD2, [ gthread-2.0 >= 2.18 ]) -AC_ARG_ENABLE(clients, - AS_HELP_STRING([--disable-clients], +AC_ARG_ENABLE(client, + AS_HELP_STRING([--disable-client], [Do not build gtk im module and ibux-x11]), - [enable_clients=$enableval], - [enable_clients=yes] + [enable_client=$enableval], + [enable_client=yes] ) -AM_CONDITIONAL([ENABLE_CLIENTS], [test x"$enable_clients" = x"yes"]) +AM_CONDITIONAL([ENABLE_CLIENT], [test x"$enable_client" = x"yes"]) -if test x"$enable_clients" != x"no"; then +if test x"$enable_client" != x"no"; then # check for gtk, gdk PKG_CHECK_MODULES(GTK2, [ gtk+-2.0 @@ -295,7 +295,7 @@ Build options: Build shared libs $enable_shared Build static libs $enable_static Gtk immodule dir $GTK_IM_MODULEDIR - Build gtk, x11 clients $enable_clients + Build gtk, x11 clients $enable_client Build python modules $enable_python Build gconf modules $enable_gconf Build document $enable_gtk_doc diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 85ab66d..70bcf34 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -22,11 +22,9 @@ libibus = $(top_builddir)/src/libibus.la -if ENABLE_GCONF libexec_PROGRAMS = \ ibus-gconf \ $(NULL) -endif ibus_gconf_SOURCES = \ main.c \ diff --git a/ibus/Makefile.am b/ibus/Makefile.am index 8fb8c58..d1cd750 100644 --- a/ibus/Makefile.am +++ b/ibus/Makefile.am @@ -23,7 +23,6 @@ SUBDIRS = \ interface \ $(NULL) -if ENABLE_PYTHON ibus_PYTHON = \ ascii.py \ application.py \ @@ -58,7 +57,6 @@ nodist_ibus_PYTHON = \ $(NULL) ibusdir = @pkgpythondir@ -endif EXTRA_DIST = \ _config.py.in \ diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am index 6a8db39..49871ed 100644 --- a/ibus/interface/Makefile.am +++ b/ibus/interface/Makefile.am @@ -20,7 +20,6 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -if ENABLE_PYTHON ibus_interface_PYTHON = \ iconfig.py \ ienginefactory.py \ @@ -33,7 +32,6 @@ ibus_interface_PYTHON = \ $(NULL) ibus_interfacedir = @pkgpythondir@/interface -endif CLEANFILES = \ *.pyc \ diff --git a/setup/Makefile.am b/setup/Makefile.am index 643bf48..0b81bf3 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -20,7 +20,6 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -if ENABLE_PYTHON ibussetup_PYTHON = \ main.py \ icon.py \ @@ -41,7 +40,6 @@ desktop_in_files = ibus-setup.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) desktopdir = $(datadir)/applications @INTLTOOL_DESKTOP_RULE@ -endif CLEANFILES = \ *.pyc \ diff --git a/ui/Makefile.am b/ui/Makefile.am index 8fe30ea..a0e287e 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -20,6 +20,8 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA +if ENABLE_PYTHON SUBDIRS = \ gtk \ $(NULL) +endif diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index dccc755..c78fcae 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -20,7 +20,6 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA -if ENABLE_PYTHON ui_gtk_PYTHON = \ candidatepanel.py \ handle.py \ @@ -44,7 +43,6 @@ component_DATA = \ gtkpanel.xml \ $(NULL) componentdir = $(pkgdatadir)/component -endif CLEANFILES = \ gtkpanel.xml \ diff --git a/util/Makefile.am b/util/Makefile.am index 61c9d00..436c524 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -20,6 +20,8 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA +if ENABLE_CLIENT SUBDIRS = \ IMdkit \ $(NULL) +endif -- 2.7.4