Set automake conditionals OS_WIN32 if on (native) Win32, and

2001-10-19  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Set automake conditionals OS_WIN32 if on (native)
	Win32, and MS_LIB_AVAILABLE if lib.exe is available. Calculate
	LT_CURRENT - LT_AGE and set LT_CURRENT_MINUS_AGE to that value.

	* atk/Makefile.am: Add atk.def to EXTRA_DIST. On Win32, use
	-export-symbols atk.def. If lib.exe is available, generate
	atk.lib, and install it.

	* atk/atk.def: Update with new entry points.

diff --git a/ChangeLog b/ChangeLog
index b921771..a48ba04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-10-19  Tor Lillqvist  <tml@iki.fi>
+
+       * configure.in: Set automake conditionals OS_WIN32 if on (native)
+       Win32, and MS_LIB_AVAILABLE if lib.exe is available. Calculate
+       LT_CURRENT - LT_AGE and set LT_CURRENT_MINUS_AGE to that value.
+
+       * atk/Makefile.am: Add atk.def to EXTRA_DIST. On Win32, use
+       -export-symbols atk.def. If lib.exe is available, generate
+       atk.lib, and install it.
+
+       * atk/atk.def: Update with new entry points.
+
 2001-10-19  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * atk/atkobject.[c|], docs/atk-sections.txt,

diff --git a/atk/Makefile.am b/atk/Makefile.am
index 73fc2a1..945b013 100644 (file)
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -1,6 +1,20 @@
+EXTRA_DIST = atk.def
+if OS_WIN32
+export_symbols = -export-symbols atk.def
+endif
 
 lib_LTLIBRARIES = libatk.la
 
+if MS_LIB_AVAILABLE
+noinst_DATA = atk.lib
+
+install-data-local:
+       cp atk.lib $(DESTDIR)$(libdir)
+
+uninstall-local:
+       -rm $(DESTDIR)$(libdir)/atk.lib
+endif
+
 libatk_la_SOURCES =            \
        atkaction.c             \
        atkcomponent.c          \
@@ -39,6 +53,7 @@ INCLUDES = \
 LDFLAGS =  \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
        -no-undefined                                           \
+       $(export_symbols)                                       \
        @DEP_LIBS@
 
 libatkincludedir=$(includedir)/atk-1.0/atk
@@ -93,3 +108,6 @@ stamp-atkmarshal.c: atkmarshal.list
        && (cmp -s xgen-gmc $(srcdir)/atkmarshal.c || cp xgen-gmc $(srcdir)/atkmarshal.c)               \
        && rm -f xgen-gmc xgen-gmc~                                                                     \
        && echo timestamp > $(@F)
+
+atk.lib: libatk.la atk.def
+       lib -name:libatk-@LT_CURRENT_MINUS_AGE@.dll -def:atk.def -out:$@

diff --git a/atk/atk.def b/atk/atk.def
index ca81723..5871c1f 100644 (file)
--- a/atk/atk.def
+++ b/atk/atk.def
@@ -2,21 +2,32 @@ EXPORTS
        atk_action_do_action
        atk_action_get_description
        atk_action_get_keybinding
+       atk_action_get_n_actions
        atk_action_get_name
        atk_action_get_type
        atk_action_set_description
        atk_add_focus_tracker
        atk_add_global_event_listener
+       atk_attribute_get_name
+       atk_attribute_get_value
+       atk_attribute_set_free
        atk_component_add_focus_handler
        atk_component_contains
+       atk_component_get_extents
+       atk_component_get_position
+       atk_component_get_size
        atk_component_get_type
        atk_component_grab_focus
        atk_component_ref_accessible_at_point
        atk_component_remove_focus_handler
+       atk_component_set_extents
+       atk_component_set_position
+       atk_component_set_size
        atk_document_get_document
        atk_document_get_document_type
        atk_document_get_type
        atk_editable_text_copy_text
+       atk_editable_text_cut_text
        atk_editable_text_delete_text
        atk_editable_text_get_type
        atk_editable_text_insert_text
@@ -26,6 +37,9 @@ EXPORTS
        atk_focus_tracker_init
        atk_focus_tracker_notify
        atk_get_default_registry
+       atk_get_root
+       atk_get_toolkit_name
+       atk_get_toolkit_version
        atk_hyperlink_get_end_index
        atk_hyperlink_get_n_anchors
        atk_hyperlink_get_object
@@ -63,6 +77,7 @@ EXPORTS
        atk_object_ref_accessible_child
        atk_object_ref_relation_set
        atk_object_ref_state_set
+       atk_object_remove_property_change_handler
        atk_object_set_description
        atk_object_set_name
        atk_object_set_parent
@@ -83,6 +98,7 @@ EXPORTS
        atk_relation_set_get_type
        atk_relation_set_new
        atk_relation_set_remove
+       atk_relation_type_from_string
        atk_relation_type_register
        atk_remove_focus_tracker
        atk_remove_global_event_listener
@@ -149,8 +165,10 @@ EXPORTS
        atk_text_get_character_at_offset
        atk_text_get_character_count
        atk_text_get_character_extents
+       atk_text_get_default_attributes
        atk_text_get_n_selections
        atk_text_get_offset_at_point
+       atk_text_get_run_attributes
        atk_text_get_selection
        atk_text_get_text
        atk_text_get_text_after_offset
@@ -162,6 +180,7 @@ EXPORTS
        atk_text_set_selection
        atk_util_get_type
        atk_value_get_current_value
+       atk_value_get_maximum_value
        atk_value_get_minimum_value
        atk_value_get_type
        atk_value_set_current_value

diff --git a/configure.in b/configure.in
index d6e808a..ce67675 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -44,16 +44,35 @@ LT_RELEASE=$ATK_MAJOR_VERSION.$ATK_MINOR_VERSION
 LT_CURRENT=`expr $ATK_MICRO_VERSION - $ATK_INTERFACE_AGE`
 LT_REVISION=$ATK_INTERFACE_AGE
 LT_AGE=`expr $ATK_BINARY_AGE - $ATK_INTERFACE_AGE`
+LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
+AC_SUBST(LT_CURRENT_MINUS_AGE)
 
 AC_PROG_CC
 AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+  *-*-mingw*)
+    atk_native_win32=yes
+    ;;
+  *)
+    atk_native_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$atk_native_win32])
+AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
+
+if test "$atk_native_win32" = "yes"; then
+  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
+fi
+AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
+
 dnl Cache $ACLOCAL_FLAGS
 AC_CACHE_CHECK([for aclocal flags], ac_cv_atk_aclocal_flags,[
    ac_cv_atk_aclocal_flags="$ACLOCAL_FLAGS"