Merge branch 'master' into broadway

[~andy/gtk] / modules / input / Makefile.am

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 9a1bf2e861f4a26c010040f4512200815770c2fb..2ba9dcf99c69f459690c009868970c70537d9558 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -17,17 +17,13 @@ INCLUDES = \
        $(INCLUDED_IMMODULE_DEFINE)
 
 DEPS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)
+       $(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)                             \
-       $(top_builddir)/gtk/$(gtktargetlib)                             \
+       $(top_builddir)/gtk/libgtk-3.la \
        $(GTK_DEP_LIBS)
 
-moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules
+moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
 
 im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_xim_la_SOURCES =            \
@@ -40,7 +36,7 @@ if HAVE_X11R6
 if INCLUDE_IM_XIM
 STATIC_XIM_MODULE = libstatic-im-xim.la
 else
-XIM_MODULE=im-xim.la 
+XIM_MODULE=im-xim.la
 endif
 endif
 
@@ -152,7 +148,7 @@ if USE_WIN32
 if INCLUDE_IM_IME
 STATIC_IME_MODULE = libstatic-im-ime.la
 else
-IME_MODULE=im-ime.la 
+IME_MODULE=im-ime.la
 endif
 endif
 
@@ -172,7 +168,7 @@ else
 MULTIPRESS_MODULE = im-multipress.la
 endif
 
-imconffiledir = $(sysconfdir)/gtk-2.0
+imconffiledir = $(sysconfdir)/gtk-3.0
 dist_imconffile_DATA = im-multipress.conf
 
 if CROSS_COMPILING
@@ -188,22 +184,22 @@ endif
 # install-data-am, and not install-exec-am. We need to ensure this gets run
 # after the libraries are installed in their final locations.
 install-data-hook:
-       @if $(RUN_QUERY_IMMODULES_TEST) ; then \
-         echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-         echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
-         $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \
+       $(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
+         echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
+         $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
+         echo "$(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \
+         $(top_builddir)/gtk/gtk-query-immodules-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache ; \
        else \
          echo "***" ; \
-         echo "*** Warning: gtk.immodules not built" ; \
+         echo "*** Warning: immodules.cache not built" ; \
          echo "***" ; \
          echo "*** Generate this file manually on host" ; \
-         echo "*** system using gtk-query-immodules-2.0" ; \
+         echo "*** system using gtk-query-immodules-3.0" ; \
          echo "***" ; \
         fi
 
 uninstall-local:
-       rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+       rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache
 
 if BUILD_DYNAMIC_MODULES
 
@@ -239,14 +235,16 @@ noinst_LTLIBRARIES =                              \
 
 included-modules: $(noinst_LTLIBRARIES)
 
-gtk.immodules: Makefile.am $(module_LTLIBRARIES)
-       $(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk.immodules
+immodules.cache: Makefile.am $(module_LTLIBRARIES)
+       $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0 $(module_LTLIBRARIES) > immodules.cache
 
-CLEANFILES = gtk.immodules
+EXTRA_DIST += README.multipress
+
+CLEANFILES = immodules.cache
 
 if CROSS_COMPILING
 else
-all-local: gtk.immodules
+all-local: immodules.cache
 endif
 
 -include $(top_srcdir)/git.mk