Link the GTK+ modules against the private library

https://bugzilla.gnome.org/show_bug.cgi?id=678037

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 6619c2de7e4f19c6ba4b0413329586fa4c1575a3..cf8cce0aa3941002df23093d0bd5de60eaf2bc23 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=adaptors gtk-2.0 gtk-3.0
+SUBDIRS= adaptors . gtk-2.0 gtk-3.0
 
 noinst_LTLIBRARIES = libatk-bridge-2.0.la
 

diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include
index e4079a7b071449228dfc1db259f1ac424f1ebfbb..8c47c7b326dd341c5073eddd20a76143b50ec77c 100644 (file)
--- a/atk-adaptor/Makefile.include
+++ b/atk-adaptor/Makefile.include
@@ -18,26 +18,4 @@ libatk_bridge_la_LIBADD = $(DBUS_LIBS) \
                          $(GMODULE_LIBS)       \
                          $(ATK_LIBS)       \
                          $(ATSPI_LIBS)       \
-                         $(top_builddir)/droute/libdroute.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/accessible-stateset.c \
-       $(top_builddir)/atk-adaptor/accessible-stateset.h \
-       $(top_builddir)/atk-adaptor/bitarray.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 \
-       $(top_builddir)/atk-adaptor/spi-dbus.c \
-       $(top_builddir)/atk-adaptor/spi-dbus.h
+                         $(top_builddir)/atk-adaptor/libatk-bridge-2.0.la

diff --git a/atk-adaptor/gtk-2.0/Makefile.am b/atk-adaptor/gtk-2.0/Makefile.am
index fd4eb7fb533fd283a3bf4124f5616311fe476494..4aac9c3d2c9e7e6731dc13b8ff2bb29c97662d4b 100644 (file)
--- a/atk-adaptor/gtk-2.0/Makefile.am
+++ b/atk-adaptor/gtk-2.0/Makefile.am
@@ -2,4 +2,4 @@
 
 include $(top_srcdir)/atk-adaptor/Makefile.include
 
-libatk_bridge_la_SOURCES += module.c
+libatk_bridge_la_SOURCES = module.c

diff --git a/atk-adaptor/gtk-3.0/Makefile.am b/atk-adaptor/gtk-3.0/Makefile.am
index 73ac9441f4fc148112b1a4b2a41bd5cefbf6e989..a67823d8b5f91ae585e9525c6ca063eb407f0481 100644 (file)
--- a/atk-adaptor/gtk-3.0/Makefile.am
+++ b/atk-adaptor/gtk-3.0/Makefile.am
@@ -2,4 +2,4 @@
 
 include $(top_srcdir)/atk-adaptor/Makefile.include
 
-libatk_bridge_la_SOURCES += module.c
+libatk_bridge_la_SOURCES = module.c