Install to gtk-3.0 as well as gtk-2.0

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 4279d76..490461d 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,52 +1,14 @@
-SUBDIRS=adaptors
-
-if RELOCATE
-    gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
-else
-    gtkmoduledir = $(libdir)/gtk-2.0/modules
-endif
-gtkmodule_LTLIBRARIES = libatk-bridge.la
-
-libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
-                         $(ATK_CFLAGS)       \
-                         -I$(top_srcdir)     \
-                         -I$(top_srcdir)/atk-adaptor/adaptors
-
-libatk_bridge_la_LDFLAGS = -no-undefined  \
-                          -module        \
-                          -avoid-version \
-                          -rpath $(gtkmoduledir)
-
-libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
-                         $(ATK_LIBS)       \
-                         $(X_LIBS)         \
-                         $(top_builddir)/droute/libdroute.la \
-                         $(top_builddir)/common/libspicommon.la \
-                         $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
-
-libatk_bridge_la_SOURCES =     \
-        accessible-leasing.c    \
-        accessible-leasing.h    \
-        accessible-cache.c      \
-        accessible-cache.h      \
-       accessible-register.c   \
-       accessible-register.h   \
-       introspection.c         \
-       introspection.h         \
-       bridge.c                \
-       bridge.h                \
-       object.c                \
-       object.h                \
-       event.c                 \
-       event.h
+SUBDIRS=adaptors gtk-2.0 gtk-3.0
 
 if RELOCATE
+    gtkpathdir = $(libdir)/gtk-2.0/modules/at-spi-dbus
 gnomeautostartdir = $(datadir)/gnome/autostart
 gnomeautostart_DATA = atk-bridge.desktop
 endif
 
-gtkpathdir = $(gtkmoduledir)/..
-EXTRA_DIST = atk-bridge.desktop.in
+EXTRA_DIST = atk-bridge.desktop.in \
+       Makefile.include
+
 CLEANFILES = atk-bridge.desktop
 
 %.desktop: %.desktop.in Makefile.am

diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include
new file mode 100644 (file)
index 0000000..d192f14
--- /dev/null
+++ b/atk-adaptor/Makefile.include
@@ -0,0 +1,34 @@
+gtkmodule_LTLIBRARIES = libatk-bridge.la
+
+libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
+                         $(ATK_CFLAGS)       \
+                         -I$(top_srcdir)     \
+                         -I$(top_srcdir)/atk-adaptor/adaptors
+
+libatk_bridge_la_LDFLAGS = -no-undefined  \
+                          -module        \
+                          -avoid-version \
+                          -rpath $(gtkmoduledir)
+
+libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
+                         $(ATK_LIBS)       \
+                         $(X_LIBS)         \
+                         $(top_builddir)/droute/libdroute.la \
+                         $(top_builddir)/common/libspicommon.la \
+                         $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
+
+libatk_bridge_la_SOURCES =     \
+        $(top_builddir)/atk-adaptor/accessible-leasing.c    \
+        $(top_builddir)/atk-adaptor/accessible-leasing.h    \
+        $(top_builddir)/atk-adaptor/accessible-cache.c      \
+        $(top_builddir)/atk-adaptor/accessible-cache.h      \
+       $(top_builddir)/atk-adaptor/accessible-register.c       \
+       $(top_builddir)/atk-adaptor/accessible-register.h       \
+       $(top_builddir)/atk-adaptor/introspection.c         \
+       $(top_builddir)/atk-adaptor/introspection.h         \
+       $(top_builddir)/atk-adaptor/bridge.c            \
+       $(top_builddir)/atk-adaptor/bridge.h            \
+       $(top_builddir)/atk-adaptor/object.c            \
+       $(top_builddir)/atk-adaptor/object.h            \
+       $(top_builddir)/atk-adaptor/event.c                     \
+       $(top_builddir)/atk-adaptor/event.h

diff --git a/atk-adaptor/gtk-2.0/Makefile.am b/atk-adaptor/gtk-2.0/Makefile.am
new file mode 100644 (file)
index 0000000..16f9f0f
--- /dev/null
+++ b/atk-adaptor/gtk-2.0/Makefile.am
@@ -0,0 +1,7 @@
+if RELOCATE
+    gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
+else
+    gtkmoduledir = $(libdir)/gtk-2.0/modules
+endif
+
+include $(top_srcdir)/atk-adaptor/Makefile.include

diff --git a/atk-adaptor/gtk-3.0/Makefile.am b/atk-adaptor/gtk-3.0/Makefile.am
new file mode 100644 (file)
index 0000000..4797b80
--- /dev/null
+++ b/atk-adaptor/gtk-3.0/Makefile.am
@@ -0,0 +1,39 @@
+if RELOCATE
+    gtkmoduledir = $(libdir)/gtk-3.0/modules/at-spi-dbus/modules
+else
+    gtkmoduledir = $(libdir)/gtk-3.0/modules
+endif
+gtkmodule_LTLIBRARIES = libatk-bridge.la
+
+libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
+                         $(ATK_CFLAGS)       \
+                         -I$(top_srcdir)     \
+                         -I$(top_srcdir)/atk-adaptor/adaptors
+
+libatk_bridge_la_LDFLAGS = -no-undefined  \
+                          -module        \
+                          -avoid-version \
+                          -rpath $(gtkmoduledir)
+
+libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
+                         $(ATK_LIBS)       \
+                         $(X_LIBS)         \
+                         $(top_builddir)/droute/libdroute.la \
+                         $(top_builddir)/common/libspicommon.la \
+                         $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
+
+libatk_bridge_la_SOURCES =     \
+        $(top_builddir)/atk-adaptor/accessible-leasing.c    \
+        $(top_builddir)/atk-adaptor/accessible-leasing.h    \
+        $(top_builddir)/atk-adaptor/accessible-cache.c      \
+        $(top_builddir)/atk-adaptor/accessible-cache.h      \
+       $(top_builddir)/atk-adaptor/accessible-register.c       \
+       $(top_builddir)/atk-adaptor/accessible-register.h       \
+       $(top_builddir)/atk-adaptor/introspection.c         \
+       $(top_builddir)/atk-adaptor/introspection.h         \
+       $(top_builddir)/atk-adaptor/bridge.c            \
+       $(top_builddir)/atk-adaptor/bridge.h            \
+       $(top_builddir)/atk-adaptor/object.c            \
+       $(top_builddir)/atk-adaptor/object.h            \
+       $(top_builddir)/atk-adaptor/event.c                     \
+       $(top_builddir)/atk-adaptor/event.h

diff --git a/configure.ac b/configure.ac
index 3797d8b..8dffa71 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,8 @@ AC_CONFIG_FILES([Makefile
                 common/Makefile
                 atk-adaptor/Makefile
                 atk-adaptor/adaptors/Makefile
+                atk-adaptor/gtk-2.0/Makefile
+                atk-adaptor/gtk-3.0/Makefile
                 po/Makefile.in
                ])