diff options
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | Makefile.am | 24 | ||||
-rw-r--r-- | atk/Makefile.am | 152 | ||||
-rwxr-xr-x | autogen.sh | 57 | ||||
-rw-r--r-- | configure.in | 163 | ||||
-rw-r--r-- | docs/Makefile.am | 167 | ||||
-rw-r--r-- | docs/atk-docs.sgml | 53 | ||||
-rw-r--r-- | po/Makefile.in.in | 55 | ||||
-rw-r--r-- | tests/Makefile.am | 2 |
9 files changed, 243 insertions, 448 deletions
@@ -1,3 +1,21 @@ +2003-03-20 James Henstridge <james@daa.com.au> + + * autogen.sh: update to call automake-1.7, libtoolize, gtkdocize + and glib-gettextize. + + * configure.in: cleanup to make use of newer autoconf/automake + features. + + * Makefile.am: get rid of custom distcheck rule, which is no + longer necessary. + + * atk/Makefile.am: cleanup makefile. Use BUILT_SOURCES for built + sources. + + * docs/Makefile.am: use common gtk-doc.make. + + * docs/atk-docs.sgml: update to use gtk-doc's XML mode. + 2003-03-16 Joel Brich <joel.brich@laposte.net> * configure.in: Added "eo" to ALL_LINGUAS diff --git a/Makefile.am b/Makefile.am index d21f511..a171ddb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,26 +12,4 @@ EXTRA_DIST = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atk.pc -# This is a version of the automake-1.4 distcheck rule modified -# to pass --enable-gtk-doc to ./configure -# -mydistcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff --git a/atk/Makefile.am b/atk/Makefile.am index 40e1c6f..d982be1 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -2,42 +2,16 @@ # which are more like other make's VPATH. GPATH = $(srcdir) -EXTRA_DIST = atk.def atk.rc atk.rc.in - -if OS_WIN32 -export_symbols = -export-symbols atk.def -no_undefined = -no-undefined - -atk_win32res = atk-win32res.lo - -install-libtool-import-lib: - $(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir) -uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libatk-$(ATK_API_VERSION).dll.a -else -install-libtool-import-lib: -uninstall-libtool-import-lib: -endif +INCLUDES = \ + -I$(top_srcdir) \ + -DG_DISABLE_DEPRECATED \ + $(DEP_CFLAGS) \ + -DATKLOCALEDIR=\""$(atklocaledir)"\" lib_LTLIBRARIES = libatk-1.0.la -if MS_LIB_AVAILABLE -noinst_DATA = atk-$(ATK_API_VERSION).lib - -install-ms-lib: - $(INSTALL) atk-$(ATK_API_VERSION).lib $(DESTDIR)$(libdir) - -uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/atk-$(ATK_API_VERSION).lib -else -install-ms-lib: -uninstall-ms-lib: -endif - -atk_built_headers = atk-enum-types.h -atk_built_cfiles = atk-enum-types.c - -$(OBJECTS): $(atk_built_headers) +libatk_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) +libatk_1_0_la_LIBADD = $(DEP_LIBS) libatk_1_0_la_SOURCES = \ atkaction.c \ @@ -63,31 +37,7 @@ libatk_1_0_la_SOURCES = \ atktext.c \ atkutil.c \ atkvalue.c \ - $(atk_built_cfiles) - -libatk_1_0_la_LIBADD = $(atk_win32res) -libatk_1_0_la_DEPENDENCIES = $(atk_win32res) - -EXTRA_DIST += atkmarshal.list \ - atkintl.h - -MAINTAINERCLEANFILES += \ - atkmarshal.c \ - atkmarshal.h \ - stamp-atkmarshal.c \ - stamp-atkmarshal.h - -INCLUDES = \ - -I$(top_srcdir) \ - -DG_DISABLE_DEPRECATED \ - @DEP_CFLAGS@ \ - -DATKLOCALEDIR=\""$(atklocaledir)"\" - -LDFLAGS = \ - -version-info $(LT_VERSION_INFO) \ - $(export_symbols) \ - $(no_undefined) \ - @DEP_LIBS@ + atk-enum-types.c libatkincludedir=$(includedir)/atk-1.0/atk @@ -120,40 +70,31 @@ atk_headers = \ libatkinclude_HEADERS = \ $(atk_headers) \ - $(atk_built_headers) + atk-enum-types.h -$(libatk_1_0_la_OBJECTS): atkmarshal.c atkmarshal.h $(atk_built_headers) -atk-win32res.lo: atk.rc - $(top_srcdir)/../glib/build/win32/lt-compile-resource atk.rc atk-win32res.lo +# ---------- Handle built sources ---------- -atkmarshal.h: @REBUILD@ stamp-atkmarshal.h +BUILT_SOURCES = atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c + +atkmarshal.h: stamp-atkmarshal.h @true -stamp-atkmarshal.h: atkmarshal.list - case @GLIB_GENMARSHAL@ in \ - .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ - *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ - esac; \ - $$glib_genmarshal --prefix=atk_marshal $(srcdir)/atkmarshal.list --header >> xgen-gmh \ - && (cmp -s xgen-gmh $(srcdir)/atkmarshal.h || cp xgen-gmh $(srcdir)/atkmarshal.h) \ - && rm -f xgen-gmh xgen-gmh~ \ +stamp-atkmarshal.h: @REBUILD@ atkmarshal.list + $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --header >> xgen-gmh \ + && (cmp -s xgen-gmh atkmarshal.h || cp xgen-gmh atkmarshal.h) \ + && rm -f xgen-gmh xgen-gmh~ \ && echo timestamp > $(@F) -atkmarshal.c: @REBUILD@ stamp-atkmarshal.c +atkmarshal.c: stamp-atkmarshal.c @true -stamp-atkmarshal.c: atkmarshal.list - case @GLIB_GENMARSHAL@ in \ - .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ - *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ - esac; \ - $$glib_genmarshal --prefix=atk_marshal $(srcdir)/atkmarshal.list --body >> xgen-gmc \ - && (cmp -s xgen-gmc $(srcdir)/atkmarshal.c || cp xgen-gmc $(srcdir)/atkmarshal.c) \ - && rm -f xgen-gmc xgen-gmc~ \ +stamp-atkmarshal.c: @REBUILD@ atkmarshal.list + $(GLIB_GENMARSHAL) --prefix=atk_marshal $(srcdir)/atkmarshal.list --body >> xgen-gmc \ + && (cmp -s xgen-gmc atkmarshal.c || cp xgen-gmc atkmarshal.c) \ + && rm -f xgen-gmc xgen-gmc~ \ && echo timestamp > $(@F) atk-enum-types.h: s-enum-types-h @true - s-enum-types-h: @REBUILD@ $(atk_headers) Makefile ( cd $(srcdir) && glib-mkenums \ --fhead "#ifndef __ATK_ENUM_TYPES_H__\n#define __ATK_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ @@ -161,13 +102,12 @@ s-enum-types-h: @REBUILD@ $(atk_headers) Makefile --vhead "GType @enum_name@_get_type (void);\n#define ATK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __ATK_ENUM_TYPES_H__ */" \ $(atk_headers) ) > tmp-atk-enum-types.h \ - && (cmp -s tmp-atk-enum-types.h $(srcdir)/atk-enum-types.h || cp tmp-atk-enum-types.h $(srcdir)/atk-enum-types.h ) \ + && (cmp -s tmp-atk-enum-types.h atk-enum-types.h || cp tmp-atk-enum-types.h atk-enum-types.h ) \ && rm -f tmp-atk-enum-types.h \ && echo timestamp > $(@F) atk-enum-types.c: s-enum-types-c @true - s-enum-types-c: @REBUILD@ $(atk_headers) Makefile ( cd $(srcdir) && glib-mkenums \ --fhead "#include <atk.h>" \ @@ -176,13 +116,55 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ $(atk_headers) ) > tmp-atk-enum-types.c \ - && (cmp -s tmp-atk-enum-types.c $(srcdir)/atk-enum-types.c || cp tmp-atk-enum-types.c $(srcdir)/atk-enum-types.c ) \ + && (cmp -s tmp-atk-enum-types.c atk-enum-types.c || cp tmp-atk-enum-types.c atk-enum-types.c ) \ && rm -f tmp-atk-enum-types.c \ && echo timestamp > $(@F) +# ---------- Win32 stuff ---------- + +if OS_WIN32 +libatk_1_0_la_LDFLAGS += -export-symbols atk.def -no-undefined +libatk_1_0_la_LIBADD += atk-win32res.lo + +install-libtool-import-lib: + $(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir) +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libatk-$(ATK_API_VERSION).dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: +endif + +atk-win32res.lo: atk.rc + $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ + +if MS_LIB_AVAILABLE +noinst_DATA = atk-$(ATK_API_VERSION).lib + +install-ms-lib: + $(INSTALL) atk-$(ATK_API_VERSION).lib $(DESTDIR)$(libdir) + +uninstall-ms-lib: + -rm $(DESTDIR)$(libdir)/atk-$(ATK_API_VERSION).lib +else +install-ms-lib: +uninstall-ms-lib: +endif atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def - lib -name:libatk-$(ATK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:atk.def -out:$@ + lib -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@ + + +EXTRA_DIST = atk.def atk.rc.in atkmarshal.list atkintl.h + +DISTCLEANFILES = \ + stamp-atkmarshal.h stamp-atkmarshal.c \ + s-enum-types-h s-enum-types-c + +distclean-local: + if test $(srcdir) = .; then :; else \ + rm -f atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c; \ + fi install-data-local: install-ms-lib install-libtool-import-lib @@ -13,8 +13,8 @@ FILE=atk/atk.h DIE=0 have_libtool=false -if libtool --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` +if libtoolize --version < /dev/null > /dev/null 2>&1 ; then + libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` case $libtool_version in 1.4*) have_libtool=true @@ -25,36 +25,37 @@ if $have_libtool ; then : ; else echo echo "You must have libtool 1.4 installed to compile $PROJECT." echo "Install the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" DIE=1 fi +(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have gtk-doc installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" + DIE=1 +} + (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have autoconf installed to compile $PROJECT." echo "libtool the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" DIE=1 } -have_automake=false -if automake-1.4 --version < /dev/null > /dev/null 2>&1 ; then - automake_version=`automake-1.4 --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'` - case $automake_version in - 1.2*|1.3*|1.4) - ;; - *) - have_automake=true - ;; - esac -fi -if $have_automake ; then : ; else - echo - echo "You must have automake 1.4-p6 installed to compile $PROJECT." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p6.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 +if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE=automake-1.7 + ACLOCAL=aclocal-1.7 +else + echo + echo "You must have automake 1.7.x installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" + DIE=1 fi + if test "$DIE" -eq 1; then exit 1 @@ -92,13 +93,17 @@ if test -z "$ACLOCAL_FLAGS"; then done fi -aclocal-1.4 $ACLOCAL_FLAGS +$ACLOCAL $ACLOCAL_FLAGS || exit 1 + +libtoolize --force || exit 1 +gtkdocize || exit 1 + +glib-gettextize --force || exit 1 -# optionally feature autoheader -(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader +autoheader || exit 1 -automake-1.4 -a $am_opt -autoconf +$AUTOMAKE --add-missing || exit 1 +autoconf || exit 1 cd $ORIGDIR if test -z "$AUTOGEN_SUBDIR_MODE"; then diff --git a/configure.in b/configure.in index e36785f..8220f6e 100644 --- a/configure.in +++ b/configure.in @@ -1,20 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.53) - -AC_INIT(ChangeLog) - -AM_CONFIG_HEADER(config.h) - -dnl ========================================================================== -dnl -dnl If you add a version number here, you *must* add an AC_SUBST line for -dnl it too, or it will never make it into the spec file! -dnl -dnl ========================================================================== - -GLIB_REQUIRED_VERSION=2.0.0 -AC_SUBST(GLIB_REQUIRED_VERSION) +AC_PREREQ(2.54) dnl ========================================================================== dnl Versioning @@ -29,18 +15,55 @@ dnl if backwards compatibility has been broken, dnl set ATK_BINARY_AGE _and_ ATK_INTERFACE_AGE to 0. dnl The triplet -ATK_MAJOR_VERSION=1 -ATK_MINOR_VERSION=2 -ATK_MICRO_VERSION=2 -ATK_VERSION=$ATK_MAJOR_VERSION.$ATK_MINOR_VERSION.$ATK_MICRO_VERSION +m4_define([atk_major_version], [1]) +m4_define([atk_minor_version], [2]) +m4_define([atk_micro_version], [2]) +m4_define([atk_version], + [atk_major_version.atk_minor_version.atk_micro_version]) dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 2. -ATK_API_VERSION=1.0 +m4_define([atk_api_version], [1.0]) dnl Number of releases since we've added interfaces -ATK_INTERFACE_AGE=2 +m4_define([atk_interface_age], [2]) + +m4_define([atk_binary_age], + [m4_eval(100 * atk_minor_version + atk_micro_version)]) + +m4_define([lt_current], + [m4_eval(100 * atk_minor_version + atk_micro_version - atk_interface_age)])` +m4_define([lt_revision], [atk_interface_age]) +m4_define([lt_age], [m4_eval(atk_binary_age - atk_interface_age)]) +m4_define([lt_version_info], [lt_current:lt_revision:lt_age]) +m4_define([lt_current_minus_age], [m4_eval(lt_current - lt_age)]) + + +AC_INIT(atk, [atk_version], + [http://bugzilla.gnome.org/enter_bug.cgi?product=atk]) +AC_CONFIG_SRCDIR([ChangeLog]) + +AM_CONFIG_HEADER(config.h) + +AM_INIT_AUTOMAKE + +dnl ========================================================================== +dnl +dnl If you add a version number here, you *must* add an AC_SUBST line for +dnl it too, or it will never make it into the spec file! +dnl +dnl ========================================================================== -ATK_BINARY_AGE=202 +GLIB_REQUIRED_VERSION=2.0.0 +AC_SUBST(GLIB_REQUIRED_VERSION) + + +ATK_MAJOR_VERSION=atk_major_version +ATK_MINOR_VERSION=atk_minor_version +ATK_MICRO_VERSION=atk_micro_version +ATK_VERSION=atk_version +ATK_API_VERSION=atk_api_version +ATK_INTERFACE_AGE=atk_interface_age +ATK_BINARY_AGE=atk_binary_age AC_SUBST(ATK_MAJOR_VERSION) AC_SUBST(ATK_MINOR_VERSION) @@ -51,31 +74,22 @@ AC_SUBST(ATK_INTERFACE_AGE) AC_SUBST(ATK_BINARY_AGE) dnl libtool versioning -lt_current=`expr 100 '*' $ATK_MINOR_VERSION + $ATK_MICRO_VERSION - $ATK_INTERFACE_AGE` -lt_revision=$ATK_INTERFACE_AGE -lt_age=`expr $ATK_BINARY_AGE - $ATK_INTERFACE_AGE` -LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" -LT_CURRENT_MINUS_AGE=`expr $lt_current - $lt_age` - +LT_VERSION_INFO=lt_version_info +LT_CURRENT_MINUS_AGE=lt_current_minus_age AC_SUBST(LT_VERSION_INFO) AC_SUBST(LT_CURRENT_MINUS_AGE) dnl ========================================================================== -AM_INIT_AUTOMAKE(atk,$ATK_VERSION) - GETTEXT_PACKAGE=atk10 AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) ALL_LINGUAS="am az be bg bn ca cs da de en_GB el eo es fa fi fr he hu kn ko id it lv mk mn ms nl no pl pt_BR ro ru sk sq sv tr uk vi zh_CN zh_TW" AM_GLIB_GNU_GETTEXT -# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME -# this is the directory where the *.{mo,gmo} files are installed -atklocaledir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(atklocaledir) +GLIB_DEFINE_LOCALEDIR(atklocaledir) AC_CHECK_FUNCS(bind_textdomain_codeset) @@ -107,7 +121,10 @@ AC_CACHE_CHECK([for aclocal flags], ac_cv_atk_aclocal_flags,[ ]) ACLOCAL="$ACLOCAL $ac_cv_atk_aclocal_flags" -AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) +AC_ARG_ENABLE(rebuilds, + [AC_HELP_STRING([--disable-rebuilds], + [disable all source autogeneration rules])],, + [enable_rebuilds=yes]) changequote(,)dnl if test "x$GCC" = "xyes"; then @@ -130,7 +147,8 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :, *** GLIB is always available from ftp://ftp.gtk.org/.]), gobject gmodule) -PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , AC_MSG_ERROR([ +PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , + AC_MSG_ERROR([ *** GLib not found. You can find it on ftp://ftp.gtk.org *** Errors follow: $DEP_PKG_ERRORS])) @@ -138,73 +156,8 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , AC_M # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0` -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) - -if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/gtk-doc/html' -else - HTML_DIR=$with_html_dir -fi - -AC_SUBST(HTML_DIR) - -gtk_doc_min_version=0.9 -AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) - -if $GTKDOC ; then - gtk_doc_version=`gtkdoc-mkdb --version` - AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version]) - IFS="${IFS= }"; atk_save_IFS="$IFS"; IFS="." - set $gtk_doc_version - for min in $gtk_doc_min_version ; do - cur=$1; shift - if test -z $min ; then break; fi - if test -z $cur ; then GTKDOC=false; break; fi - if test $cur -gt $min ; then break ; fi - if test $cur -lt $min ; then GTKDOC=false; break ; fi - done - IFS="$atk_save_IFS" - - if $GTKDOC ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi -fi - -atktargetlib=libatk-$ATK_API_VERSION.la -AC_SUBST(atktargetlib) - -AC_MSG_CHECKING(whether make is GNU Make) -STRIP_BEGIN= -STRIP_END= -if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then - STRIP_BEGIN='$(strip $(STRIP_DUMMY)' - STRIP_END=')' - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -STRIP_DUMMY= -AC_SUBST(STRIP_DUMMY) -AC_SUBST(STRIP_BEGIN) -AC_SUBST(STRIP_END) - -dnl Disable the gtk-doc stuff by default to avoid Jade hassles -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=no) - -if test x$enable_gtk_doc = xyes ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no - fi -fi - -dnl NOTE: We need to use a separate automake conditional for this -dnl to make this work with the tarballs. -AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +GTK_DOC_CHECK([1.0]) # define a MAINT-like variable REBUILD which is set if Perl # and awk are found, so autogenerated sources can be rebuilt @@ -221,7 +174,7 @@ if test "x$enable_rebuilds" = "xyes" && \ fi AC_SUBST(REBUILD) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile po/Makefile.in atk.pc @@ -233,3 +186,5 @@ docs/Makefile atk.spec atk-zip.sh ]) + +AC_OUTPUT diff --git a/docs/Makefile.am b/docs/Makefile.am index 3310ced..93265d6 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = Makefile.am atk-api.sgml atk-docs.sgml atk-sections.txt +AUTOMAKE_OPTIONS = 1.6 # The name of the module. DOC_MODULE=atk @@ -11,162 +11,25 @@ DOC_MAIN_SGML_FILE=atk-docs.sgml # The directory containing the source code (if it contains documentation). DOC_SOURCE_DIR=../atk +# Used for dependencies +HFILE_GLOB = $(top_srcdir)/atk/*.h +CFILE_GLOB = $(top_srcdir)/atk/*.c + # Header files to ignore when scanning IGNORE_HFILES = atkmarshal.h atkintl.h -# Images to copy into HTML directory -HTML_IMAGES = - -# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE) -content_files = - -# Other files to distribute -extra_files = - # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = @STRIP_BEGIN@ \ - @CFLAGS@ \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - @DEP_CFLAGS@ \ -@STRIP_END@ - -GTKDOC_LIBS = @STRIP_BEGIN@ \ - $(top_builddir)/atk/@atktargetlib@ \ -@STRIP_END@ - -GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) -GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) - - -dist-hook-local: all-local - -#################################### -# Everything below here is generic # -#################################### - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(extra_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE).types \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).signals - -if ENABLE_GTK_DOC -all-local: html-build.stamp +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(DEP_CFLAGS) -#### scan #### +GTKDOC_LIBS = $(top_builddir)/atk/libatk-$(ATK_API_VERSION).la -scan-build.stamp: $(HFILE_GLOB) - @echo '*** Scanning header files ***' - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo '*** Rebuilding template files ***' - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -#### sgml #### - -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml - @echo '*** Building SGML ***' - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo '*** Building HTML ***' - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo '-- Fixing Crossreferences' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp -endif - -############## - -clean-local: - rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS) - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ - fi) - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/sgml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml - -cp $(srcdir)/html/* $(distdir)/html +# gtkdoc-mkdb related varaibles +MKDB_OPTIONS = +content_files = +HTML_IMAGES = -.PHONY : dist-hook-local +include $(top_srcdir)/gtk-doc.make diff --git a/docs/atk-docs.sgml b/docs/atk-docs.sgml index 3345b41..08da5e9 100644 --- a/docs/atk-docs.sgml +++ b/docs/atk-docs.sgml @@ -1,27 +1,29 @@ -<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [ -<!entity atk-AtkAction SYSTEM "sgml/atkaction.sgml"> -<!entity atk-AtkComponent SYSTEM "sgml/atkcomponent.sgml"> -<!entity atk-AtkDocument SYSTEM "sgml/atkdocument.sgml"> -<!entity atk-AtkEditabletext SYSTEM "sgml/atkeditabletext.sgml"> -<!entity atk-AtkGObjectAccessible SYSTEM "sgml/atkgobjectaccessible.sgml"> -<!entity atk-AtkHyperlink SYSTEM "sgml/atkhyperlink.sgml"> -<!entity atk-AtkHypertext SYSTEM "sgml/atkhypertext.sgml"> -<!entity atk-AtkImage SYSTEM "sgml/atkimage.sgml"> -<!entity atk-AtkNoOpObject SYSTEM "sgml/atknoopobject.sgml"> -<!entity atk-AtkNoOpObjectFactory SYSTEM "sgml/atknoopobjectfactory.sgml"> -<!entity atk-AtkObject SYSTEM "sgml/atkobject.sgml"> -<!entity atk-AtkObjectFactory SYSTEM "sgml/atkobjectfactory.sgml"> -<!entity atk-AtkRegistry SYSTEM "sgml/atkregistry.sgml"> -<!entity atk-AtkRelation SYSTEM "sgml/atkrelation.sgml"> -<!entity atk-AtkRelationSet SYSTEM "sgml/atkrelationset.sgml"> -<!entity atk-AtkSelection SYSTEM "sgml/atkselection.sgml"> -<!entity atk-AtkState SYSTEM "sgml/atkstate.sgml"> -<!entity atk-AtkStateSet SYSTEM "sgml/atkstateset.sgml"> -<!entity atk-AtkStreamableContent SYSTEM "sgml/atkstreamablecontent.sgml"> -<!entity atk-AtkTable SYSTEM "sgml/atktable.sgml"> -<!entity atk-AtkText SYSTEM "sgml/atktext.sgml"> -<!entity atk-AtkUtil SYSTEM "sgml/atkutil.sgml"> -<!entity atk-AtkValue SYSTEM "sgml/atkvalue.sgml"> +<?xml version="1.0"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY atk-AtkAction SYSTEM "xml/atkaction.xml"> + <!ENTITY atk-AtkComponent SYSTEM "xml/atkcomponent.xml"> + <!ENTITY atk-AtkDocument SYSTEM "xml/atkdocument.xml"> + <!ENTITY atk-AtkEditabletext SYSTEM "xml/atkeditabletext.xml"> + <!ENTITY atk-AtkGObjectAccessible SYSTEM "xml/atkgobjectaccessible.xml"> + <!ENTITY atk-AtkHyperlink SYSTEM "xml/atkhyperlink.xml"> + <!ENTITY atk-AtkHypertext SYSTEM "xml/atkhypertext.xml"> + <!ENTITY atk-AtkImage SYSTEM "xml/atkimage.xml"> + <!ENTITY atk-AtkNoOpObject SYSTEM "xml/atknoopobject.xml"> + <!ENTITY atk-AtkNoOpObjectFactory SYSTEM "xml/atknoopobjectfactory.xml"> + <!ENTITY atk-AtkObject SYSTEM "xml/atkobject.xml"> + <!ENTITY atk-AtkObjectFactory SYSTEM "xml/atkobjectfactory.xml"> + <!ENTITY atk-AtkRegistry SYSTEM "xml/atkregistry.xml"> + <!ENTITY atk-AtkRelation SYSTEM "xml/atkrelation.xml"> + <!ENTITY atk-AtkRelationSet SYSTEM "xml/atkrelationset.xml"> + <!ENTITY atk-AtkSelection SYSTEM "xml/atkselection.xml"> + <!ENTITY atk-AtkState SYSTEM "xml/atkstate.xml"> + <!ENTITY atk-AtkStateSet SYSTEM "xml/atkstateset.xml"> + <!ENTITY atk-AtkStreamableContent SYSTEM "xml/atkstreamablecontent.xml"> + <!ENTITY atk-AtkTable SYSTEM "xml/atktable.xml"> + <!ENTITY atk-AtkText SYSTEM "xml/atktext.xml"> + <!ENTITY atk-AtkUtil SYSTEM "xml/atkutil.xml"> + <!ENTITY atk-AtkValue SYSTEM "xml/atkvalue.xml"> ]> <book> @@ -31,6 +33,7 @@ <chapter id="atk"> <title>ATK Library</title> + &atk-AtkAction; &atk-AtkComponent; &atk-AtkDocument; @@ -54,6 +57,6 @@ &atk-AtkText; &atk-AtkUtil; &atk-AtkValue; - </chapter> + </chapter> </book> diff --git a/po/Makefile.in.in b/po/Makefile.in.in index d8bc42e..435cd18 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -9,8 +9,11 @@ # - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE # instead of PACKAGE and to look for po2tbl in ./ not in intl/ # +# - Modified by jacob berkman <jacob@ximian.com> to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ VERSION = @VERSION@ SHELL = /bin/sh @@ -22,10 +25,11 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix)/@DATADIRNAME@ -localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = $(prefix)/share/gettext/po +datadir = @datadir@ +libdir = @libdir@ +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po INSTALL = @INSTALL@ @@ -34,10 +38,10 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ CC = @CC@ GENCAT = @GENCAT@ -GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ +GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ -XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ -MSGMERGE = PATH=../src:$$PATH msgmerge +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge DEFS = @DEFS@ CFLAGS = @CFLAGS@ @@ -47,11 +51,11 @@ INCLUDES = -I.. -I$(top_srcdir)/intl COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -SOURCES = cat-id-tbl.c +SOURCES = POFILES = @POFILES@ GMOFILES = @GMOFILES@ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ -stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) +$(POFILES) $(GMOFILES) $(SOURCES) POTFILES = \ @@ -83,7 +87,7 @@ INSTOBJEXT = @INSTOBJEXT@ all: all-@USE_NLS@ -all-yes: cat-id-tbl.c $(CATALOGS) +all-yes: $(CATALOGS) all-no: $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) @@ -94,21 +98,6 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) -$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: -$(srcdir)/stamp-cat-id: $(GETTEXT_PACKAGE).pot - rm -f cat-id-tbl.tmp - sed -f ./po2tbl.sed $(srcdir)/$(GETTEXT_PACKAGE).pot \ - | sed -e "s/@GETTEXT_PACKAGE NAME@/$(GETTEXT_PACKAGE)/" > cat-id-tbl.tmp - if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ - rm cat-id-tbl.tmp; \ - else \ - echo cat-id-tbl.c changed; \ - rm -f $(srcdir)/cat-id-tbl.c; \ - mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ - fi - cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id - - install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ @@ -155,7 +144,7 @@ install-data-yes: all fi; \ fi; \ done - if test "$(GETTEXT_PACKAGE)" = "gettext"; then \ + if test "$(PACKAGE)" = "glib"; then \ if test -r "$(MKINSTALLDIRS)"; then \ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ else \ @@ -184,8 +173,6 @@ uninstall: check: all -cat-id-tbl.o: ../intl/libgettext.h - dvi info tags TAGS ID: mostlyclean: @@ -195,7 +182,7 @@ mostlyclean: clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m po2tbl.sed + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -212,7 +199,6 @@ dist distdir: update-po $(DISTFILES) update-po: Makefile $(MAKE) $(GETTEXT_PACKAGE).pot - PATH=`pwd`/../src:$$PATH; \ cd $(srcdir); \ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ @@ -229,6 +215,9 @@ update-po: Makefile fi; \ done +# POTFILES is created from POTFILES.in by stripping comments, empty lines +# and Intltool tags (enclosed in square brackets), and appending a full +# relative path to them POTFILES: POTFILES.in ( if test 'x$(srcdir)' != 'x.'; then \ posrcprefix='$(top_srcdir)/'; \ @@ -236,8 +225,10 @@ POTFILES: POTFILES.in posrcprefix="../"; \ fi; \ rm -f $@-t $@ \ - && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + && (sed -e '/^#/d' \ + -e "s/^\[.*\] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ | sed -e '$$s/\\$$//') > $@-t \ && chmod a-w $@-t \ && mv $@-t $@ ) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8e3317f..89dfc21 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,7 +7,7 @@ libatk = $(top_builddir)/atk/libatk-$(ATK_API_VERSION).la INCLUDES = -I$(top_srcdir) \ -DG_DISABLE_DEPRECATED \ - @DEP_CFLAGS@ + $(DEP_CFLAGS) DEPS = \ $(libatk) |