Removed the extra boolean parameter added to know when to unref the

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / Makefile.am

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 8538c4c..490461d 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,47 +1,16 @@
-SUBDIRS=adaptors
+SUBDIRS=adaptors gtk-2.0 gtk-3.0
 
 if RELOCATE
-    gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
-else
-    gtkmoduledir = $(libdir)/gtk-2.0/modules
+    gtkpathdir = $(libdir)/gtk-2.0/modules/at-spi-dbus
+gnomeautostartdir = $(datadir)/gnome/autostart
+gnomeautostart_DATA = atk-bridge.desktop
 endif
-gtkmodule_LTLIBRARIES = libatk-bridge.la
-
-libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
-                         $(ATK_CFLAGS)       \
-                         -I$(top_srcdir)     \
-                         -I$(top_srcdir)/atk-adaptor/adaptors \
-                         -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
-libatk_bridge_la_LDFLAGS = -no-undefined  \
-                          -module        \
-                          -avoid-version \
-                          -rpath $(gtkmoduledir)
+EXTRA_DIST = atk-bridge.desktop.in \
+       Makefile.include
 
-libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
-                         $(ATK_LIBS)       \
-                         $(X_LIBS)         \
-                         $(top_builddir)/droute/libdroute.la \
-                         $(top_builddir)/dbind/libdbind.la \
-                         $(top_builddir)/common/libspicommon.la \
-                         $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
-
-libatk_bridge_la_SOURCES =     \
-       accessible-register.c   \
-       accessible-register.h   \
-       bridge.c                \
-       bridge.h                \
-       event.c                 \
-       event.h
-
-if RELOCATE
-gtkpathdir = $(gtkmoduledir)/..
-gnomeautostartdir = $(datadir)/gnome/autostart
-gnomeautostart_DATA = atk-bridge.desktop
-EXTRA_DIST = atk-bridge.desktop.in
-CLEANFILES = $(gnome_autostart_DATA)
+CLEANFILES = atk-bridge.desktop
 
 %.desktop: %.desktop.in Makefile.am
        sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
        < $< > $@
-endif