diff options
| author | Bastien Nocera <hadess@hadess.net> | 2012-06-13 17:01:02 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2012-06-14 18:13:31 +0100 |
| commit | a80c880b92e4947c011c46ebdac122023ed0ea6b (patch) | |
| tree | 42c8fd54038af8f45142bd28848cb50d2141c837 | |
| parent | ffd010474d49259d95b81bdfa5550ddb95a23f35 (diff) | |
| download | at-spi2-atk-a80c880b92e4947c011c46ebdac122023ed0ea6b.tar.gz | |
Link the GTK+ modules against the private library
https://bugzilla.gnome.org/show_bug.cgi?id=678037
| -rw-r--r-- | atk-adaptor/Makefile.am | 2 | ||||
| -rw-r--r-- | atk-adaptor/Makefile.include | 24 | ||||
| -rw-r--r-- | atk-adaptor/gtk-2.0/Makefile.am | 2 | ||||
| -rw-r--r-- | atk-adaptor/gtk-3.0/Makefile.am | 2 |
4 files changed, 4 insertions, 26 deletions
diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am index 6619c2d..cf8cce0 100644 --- 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 e4079a7..8c47c7b 100644 --- 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 fd4eb7f..4aac9c3 100644 --- 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 73ac944..a67823d 100644 --- 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 |