gdk-pixbuf/Makefile.am Use install-data-hook for gdk-pixbuf.loaders and

Mon Nov 17 16:25:04 2003  Manish Singh <yosh@gimp.org>

        * gdk-pixbuf/Makefile.am
        * modules/input/Makefile.am: Use install-data-hook for
        gdk-pixbuf.loaders and gtk.immodules install generation targets.
        Fixes #112806.

        * gtk/gtkexpander.h: Apply missing declarations from #124449.

diff --git a/ChangeLog b/ChangeLog
index d9222cdad7c4ff96c48a91ae3c8de2685ba83b04..3ee6f7f550c411916862972ffa25a80a7d45c38e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Nov 17 16:25:04 2003  Manish Singh <yosh@gimp.org>
+
+       * gdk-pixbuf/Makefile.am
+       * modules/input/Makefile.am: Use install-data-hook for
+       gdk-pixbuf.loaders and gtk.immodules install generation targets.
+       Fixes #112806.
+
+       * gtk/gtkexpander.h: Apply missing declarations from #124449.
+
 Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #119555, Peter Zelesny:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d9222cdad7c4ff96c48a91ae3c8de2685ba83b04..3ee6f7f550c411916862972ffa25a80a7d45c38e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Mon Nov 17 16:25:04 2003  Manish Singh <yosh@gimp.org>
+
+       * gdk-pixbuf/Makefile.am
+       * modules/input/Makefile.am: Use install-data-hook for
+       gdk-pixbuf.loaders and gtk.immodules install generation targets.
+       Fixes #112806.
+
+       * gtk/gtkexpander.h: Apply missing declarations from #124449.
+
 Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #119555, Peter Zelesny:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d9222cdad7c4ff96c48a91ae3c8de2685ba83b04..3ee6f7f550c411916862972ffa25a80a7d45c38e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Mon Nov 17 16:25:04 2003  Manish Singh <yosh@gimp.org>
+
+       * gdk-pixbuf/Makefile.am
+       * modules/input/Makefile.am: Use install-data-hook for
+       gdk-pixbuf.loaders and gtk.immodules install generation targets.
+       Fixes #112806.
+
+       * gtk/gtkexpander.h: Apply missing declarations from #124449.
+
 Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #119555, Peter Zelesny:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d9222cdad7c4ff96c48a91ae3c8de2685ba83b04..3ee6f7f550c411916862972ffa25a80a7d45c38e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Mon Nov 17 16:25:04 2003  Manish Singh <yosh@gimp.org>
+
+       * gdk-pixbuf/Makefile.am
+       * modules/input/Makefile.am: Use install-data-hook for
+       gdk-pixbuf.loaders and gtk.immodules install generation targets.
+       Fixes #112806.
+
+       * gtk/gtkexpander.h: Apply missing declarations from #124449.
+
 Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #119555, Peter Zelesny:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d9222cdad7c4ff96c48a91ae3c8de2685ba83b04..3ee6f7f550c411916862972ffa25a80a7d45c38e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Mon Nov 17 16:25:04 2003  Manish Singh <yosh@gimp.org>
+
+       * gdk-pixbuf/Makefile.am
+       * modules/input/Makefile.am: Use install-data-hook for
+       gdk-pixbuf.loaders and gtk.immodules install generation targets.
+       Fixes #112806.
+
+       * gtk/gtkexpander.h: Apply missing declarations from #124449.
+
 Tue Nov 18 00:12:55 2003  Matthias Clasen  <maclas@gmx.de>
 
        Fix for #119555, Peter Zelesny:

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 6b6c8e6cb3ac148bb4901720c326851a600f07a9..1666a261026749a368a0008c3f008878ee72caba 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -426,7 +426,11 @@ endif
 
 # Running this if cross compiling or if DESTDIR is set is going to
 # not work at all, so skip it
-install-data-local: install-ms-lib install-libtool-import-lib
+# We use install-data-hook here to workaround a bug in automake and/or libtool
+# that makes the install target for the loader libraries a dependency on
+# 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: install-ms-lib install-libtool-import-lib
        @if $(RUN_QUERY_LOADER_TEST) ; then \
          $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
          $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \

diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index e838a80aa61eede5834a445ed5a3e29df544b657..7c568848b75330b6f86606ea877abe69fb51fa7f 100644 (file)
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -78,6 +78,10 @@ void                  gtk_expander_set_use_underline (GtkExpander *expander,
                                                      gboolean     use_underline);
 gboolean              gtk_expander_get_use_underline (GtkExpander *expander);
 
+void                  gtk_expander_set_use_markup    (GtkExpander *expander,
+                                                     gboolean    use_markup);
+gboolean              gtk_expander_get_use_markup    (GtkExpander *expander);
+
 void                  gtk_expander_set_label_widget  (GtkExpander *expander,
                                                      GtkWidget   *label_widget);
 GtkWidget            *gtk_expander_get_label_widget  (GtkExpander *expander);

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index dc552b5886df011ee8fe57b45086ebbd51a77f7d..5f8400fd5892ad626e85366a7531badb6b9e99c2 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -87,7 +87,11 @@ endif
 
 # Running this if cross compiling or if DESTDIR is set is going to
 # not work at all, so skip it.
-install-data-local:
+# We use install-data-hook here to workaround a bug in automake and/or libtool
+# that makes the install target for the loader libraries a dependency on
+# 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 ; \