AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Manish Singh 2003-11-18 00:26:51 +00:00 committed by Manish Singh
parent d3b444a4c5
commit 477e349f84
8 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de>
Fix for #119555, Peter Zelesny: Fix for #119555, Peter Zelesny:

9
ChangeLog.pre-2-10
View File

@ -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> Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de>
Fix for #119555, Peter Zelesny: Fix for #119555, Peter Zelesny:

9
ChangeLog.pre-2-4
View File

@ -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> Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de>
Fix for #119555, Peter Zelesny: Fix for #119555, Peter Zelesny:

9
ChangeLog.pre-2-6
View File

@ -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> Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de>
Fix for #119555, Peter Zelesny: Fix for #119555, Peter Zelesny:

9
ChangeLog.pre-2-8
View File

@ -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> Tue Nov 18 00:12:55 2003 Matthias Clasen <maclas@gmx.de>
Fix for #119555, Peter Zelesny: Fix for #119555, Peter Zelesny:

6
gdk-pixbuf/Makefile.am
View File

@ -426,7 +426,11 @@ endif
# Running this if cross compiling or if DESTDIR is set is going to # Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it # 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 \ @if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \

4
gtk/gtkexpander.h
View File

@ -78,6 +78,10 @@ void gtk_expander_set_use_underline (GtkExpander *expander,
gboolean use_underline); gboolean use_underline);
gboolean gtk_expander_get_use_underline (GtkExpander *expander); 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, void gtk_expander_set_label_widget (GtkExpander *expander,
GtkWidget *label_widget); GtkWidget *label_widget);
GtkWidget *gtk_expander_get_label_widget (GtkExpander *expander); GtkWidget *gtk_expander_get_label_widget (GtkExpander *expander);

6
modules/input/Makefile.am
View File

@ -87,7 +87,11 @@ endif
# Running this if cross compiling or if DESTDIR is set is going to # Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it. # 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 \ @if $(RUN_QUERY_IMMODULES_TEST) ; then \
echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \