From d20ce3a1d8bbd38c2d43ce0e03670fb016217001 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 21 Nov 2002 20:19:01 +0000 Subject: [PATCH] Add package version info to API docs. --- ChangeLog | 2 ++ ChangeLog.pre-2-10 | 2 ++ ChangeLog.pre-2-2 | 2 ++ ChangeLog.pre-2-4 | 2 ++ ChangeLog.pre-2-6 | 2 ++ ChangeLog.pre-2-8 | 2 ++ configure.in | 18 +++++++++++++++++- docs/reference/ChangeLog | 18 +++++++++++++++++- docs/reference/gdk-pixbuf/Makefile.am | 3 ++- docs/reference/gdk-pixbuf/gdk-pixbuf.sgml | 3 ++- docs/reference/gdk-pixbuf/version.xml.in | 1 + docs/reference/gdk/Makefile.am | 6 ++++-- docs/reference/gdk/gdk-docs.sgml | 2 ++ docs/reference/gdk/version.xml.in | 1 + docs/reference/gtk/Makefile.am | 3 ++- docs/reference/gtk/gtk-docs.sgml | 3 ++- docs/reference/gtk/version.xml.in | 1 + 17 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 docs/reference/gdk-pixbuf/version.xml.in create mode 100644 docs/reference/gdk/version.xml.in create mode 100644 docs/reference/gtk/version.xml.in diff --git a/ChangeLog b/ChangeLog index 766b1583d7..04d652ac9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-11-21 Matthias Clasen + * configure.in: Generate docs/reference/*/version.xml. + * gtk/gtkwidget.c (gtk_widget_get_ancestor): Add a note about reflexive ancestry. (#99085, Frederic Lespez) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 766b1583d7..04d652ac9b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,7 @@ 2002-11-21 Matthias Clasen + * configure.in: Generate docs/reference/*/version.xml. + * gtk/gtkwidget.c (gtk_widget_get_ancestor): Add a note about reflexive ancestry. (#99085, Frederic Lespez) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 766b1583d7..04d652ac9b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,7 @@ 2002-11-21 Matthias Clasen + * configure.in: Generate docs/reference/*/version.xml. + * gtk/gtkwidget.c (gtk_widget_get_ancestor): Add a note about reflexive ancestry. (#99085, Frederic Lespez) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 766b1583d7..04d652ac9b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,7 @@ 2002-11-21 Matthias Clasen + * configure.in: Generate docs/reference/*/version.xml. + * gtk/gtkwidget.c (gtk_widget_get_ancestor): Add a note about reflexive ancestry. (#99085, Frederic Lespez) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 766b1583d7..04d652ac9b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,7 @@ 2002-11-21 Matthias Clasen + * configure.in: Generate docs/reference/*/version.xml. + * gtk/gtkwidget.c (gtk_widget_get_ancestor): Add a note about reflexive ancestry. (#99085, Frederic Lespez) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 766b1583d7..04d652ac9b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,7 @@ 2002-11-21 Matthias Clasen + * configure.in: Generate docs/reference/*/version.xml. + * gtk/gtkwidget.c (gtk_widget_get_ancestor): Add a note about reflexive ancestry. (#99085, Frederic Lespez) diff --git a/configure.in b/configure.in index 99cff557a2..a2bb77494d 100644 --- a/configure.in +++ b/configure.in @@ -615,11 +615,24 @@ AC_MSG_RESULT($gdk_working_wctype) AC_SUBST(GDK_WLIBS) - ################################################## # Checks for gdk-pixbuf ################################################## +dnl ******************************************************** +dnl * See whether we need to load our modules as .la files * +dnl ******************************************************** + +use_la_modules=false +case $host in + *-aix*) use_la_modules=true +esac + +if $use_la_modules ; then + AC_DEFINE(USE_LA_MODULES, 1, [Whether to load modules via .la files rather than directly]) +fi + + AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf) AC_ARG_ENABLE(modules, [ --disable-modules disable dynamic module loading],[ @@ -1575,8 +1588,11 @@ tests/Makefile docs/Makefile docs/reference/Makefile docs/reference/gdk-pixbuf/Makefile +docs/reference/gdk-pixbuf/version.xml docs/reference/gdk/Makefile +docs/reference/gdk/version.xml docs/reference/gtk/Makefile +docs/reference/gtk/version.xml docs/faq/Makefile docs/tutorial/Makefile gdk-pixbuf/Makefile diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 9e6b874161..0be5c38769 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,6 +1,22 @@ 2002-11-21 Matthias Clasen - * gtk/tmpl/gtkcombo.sgml: Fix typo in example code. (#99078) + * gdk/Makefile.am (extra_files): + * gdk-pixbuf/Makefile.am (extra_files): + * gtk/Makefile.am (extra_files): Add version.xml.in. + + * gdk/Makefile.am (content_files): + * gdk-pixbuf/Makefile.am (content_files): + * gtk/Makefile.am (content_files): Add version.xml. + + * gdk/version.xml.in: + * gdk-pixbuf/version.xml.in: + * gtk/version.xml.in: New files to let configure dump the version in. + + * gdk/gdk-docs.sgml: + * gdk-pixbuf/gdk-pixbuf.sgml: + * gtk/gtk-docs.sgml: Add version information. + + * gtk/tmpl/gtkcombo.sgml: Fix typo in example code. (#99078) Sun Nov 17 15:42:08 2002 Jonathan Blandford diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index 87db5013c3..9738e3e9a6 100644 --- a/docs/reference/gdk-pixbuf/Makefile.am +++ b/docs/reference/gdk-pixbuf/Makefile.am @@ -41,13 +41,14 @@ HTML_IMAGES = # Extra SGML files that are included by DOC_MAIN_SGML_FILE content_files = \ + version.xml \ gdk-pixbuf-from-drawables.sgml \ gdk-pixbuf-rendering.sgml \ gdk-pixbuf.sgml \ porting-from-imlib.sgml # Other files to distribute -extra_files = +extra_files = version.xml.in # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml index 02b8b9c7a8..4228dd8b1a 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml @@ -24,12 +24,13 @@ gdk-pixbuf"> Imlib"> + ]> The &gdk-pixbuf; Library - + Version &version; Federico diff --git a/docs/reference/gdk-pixbuf/version.xml.in b/docs/reference/gdk-pixbuf/version.xml.in new file mode 100644 index 0000000000..3bb59ac105 --- /dev/null +++ b/docs/reference/gdk-pixbuf/version.xml.in @@ -0,0 +1 @@ +@GTK_VERSION@ diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am index bfbc27fe4e..5d320acbd0 100644 --- a/docs/reference/gdk/Makefile.am +++ b/docs/reference/gdk/Makefile.am @@ -121,10 +121,12 @@ HTML_IMAGES = \ images/xterm.png # Extra SGML files that are included by DOC_MAIN_SGML_FILE -content_files = multihead.sgml +content_files = \ + version.xml \ + multihead.sgml # Other files to distribute -extra_files = +extra_files = version.xml.in # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index 5f2474e233..e0e6c5a1bd 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -29,11 +29,13 @@ + ]> GDK Reference Manual + for GDK &version; diff --git a/docs/reference/gdk/version.xml.in b/docs/reference/gdk/version.xml.in new file mode 100644 index 0000000000..3bb59ac105 --- /dev/null +++ b/docs/reference/gdk/version.xml.in @@ -0,0 +1 @@ +@GTK_VERSION@ diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index a0cc9a5d64..eaa28079ef 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -126,6 +126,7 @@ HTML_IMAGES = \ # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) content_files = \ + version.xml \ running.sgml \ building.sgml \ changes-1.2.sgml \ @@ -141,7 +142,7 @@ content_files = \ x11.sgml # Other files to distribute -extra_files = +extra_files = version.xml.in # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index dd66214ccb..522072dbb2 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -156,11 +156,12 @@ - + ]> GTK+ Reference Manual + for GTK+ &version; diff --git a/docs/reference/gtk/version.xml.in b/docs/reference/gtk/version.xml.in new file mode 100644 index 0000000000..3bb59ac105 --- /dev/null +++ b/docs/reference/gtk/version.xml.in @@ -0,0 +1 @@ +@GTK_VERSION@