daemon: allow "eavesdrop" match rule

[platform/upstream/ibus.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 29c57e1..6d6e551 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,45 +22,44 @@
 
 NULL =
 
-if ENABLE_PYTHON
-PYTHON_DIRS =       \
-       ibus            \
-       ui              \
-       setup           \
-       $(NULL)
+if ENABLE_UI
+UI_DIR = ui
 endif
 
-if ENABLE_GCONF
-GCONF_DIRS =        \
-       gconf           \
-       $(NULL)
+if ENABLE_ENGINE
+ENGINE_DIR = engine
 endif
 
-if ENABLE_DAEMON
-DAEMON_DIRS =       \
-       bus             \
-       $(NULL)
+if ENABLE_SETUP
+SETUP_DIR = setup
 endif
 
-if ENABLE_MEMCONF
-MEMCONF_DIRS = \
-       memconf \
+if ENABLE_PYTHON_LIBRARY
+PYTHON_LIB_DIRS = ibus
+endif
+
+if ENABLE_DAEMON
+DAEMON_DIR = \
+       bus \
        $(NULL)
 endif
 
-SUBDIRS =           \
-       src             \
-       util            \
-       client          \
-       data            \
-       m4              \
-       po              \
-       docs            \
-       bindings        \
-       $(DAEMON_DIRS)  \
-       $(PYTHON_DIRS)  \
-       $(GCONF_DIRS)   \
-       $(MEMCONF_DIRS) \
+SUBDIRS = \
+       src \
+       bindings \
+       util \
+       conf \
+       client \
+       tools \
+       data \
+       m4 \
+       po \
+       docs \
+       $(ENGINE_DIR) \
+       $(UI_DIR) \
+       $(DAEMON_DIR) \
+       $(PYTHON_LIB_DIRS) \
+       $(SETUP_DIR) \
        $(NULL)
 
 ACLOCAL_AMFLAGS = -I m4
@@ -74,6 +73,7 @@ EXTRA_DIST = \
        $(ibus_pc_in) \
        ibus.spec.in \
        python-config.py \
+       xinput-ibus \
        $(NULL)
 
 noinst_DIST = \
@@ -97,6 +97,15 @@ dist-hook:
                git log --name-status --date=iso > $(distdir)/ChangeLog ; \
        fi
 
+distclean-local:
+       if test "x$(srcdir)" = "x."; then :; else \
+               rm -f ChangeLog; \
+       fi
+
+MAINTAINERCLEANFILES = \
+       $(srcdir)/ChangeLog \
+       $(NULL)
+
 rpm: dist @PACKAGE_NAME@.spec
        rpmbuild -bb \
                        --define "_sourcedir `pwd`" \
@@ -119,11 +128,12 @@ srpm: dist @PACKAGE_NAME@.spec
 debian/changelog:
        $(AM_V_GEN) \
        ( \
+               . /etc/lsb-release; \
                date=`date -R`; \
                version=@VERSION@; \
                serie=$(serie); \
                if test -z "$$serie"; then \
-                 serie=maverick; \
+                 serie=$$DISTRIB_CODENAME; \
                fi; \
                if test -z "$$release"; then \
                  release=1; \
@@ -167,4 +177,21 @@ git-tag:
 git-clean-tree:
        git clean -d -f -x
 
+GITIGNOREFILES = \
+       INSTALL \
+       aclocal.m4 \
+       compile \
+       config.guess \
+       config.h.in \
+       config.sub \
+       depcomp \
+       gtk-doc.make \
+       install-sh \
+       ltmain.sh \
+       missing \
+       mkinstalldirs \
+       py-compile \
+       stamp-h* \
+       $(NULL)
+
 -include $(top_srcdir)/git.mk