X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2FMakefile.am;h=5d89a2d67c6d76f5324d9e76efcfd66e7f043780;hb=23e1fbe67ae5d62868e64aa60b6807c6bc120f6a;hp=c47cefc60435a5f48cc13542e3ce7a7721f7c2c6;hpb=dfc071dcf2f98f282616911cb0eb1636c93f3e77;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index c47cefc..5d89a2d 100644
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,30 +1,36 @@
-gtkmoduledir = $(libdir)/$(GTK_MODULE_DIR)
-gtkmodule_LTLIBRARIES = libspiatk.la
+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
 
-libspiatk_la_CFLAGS = $(DBUS_GLIB_CFLAGS)\
-		      $(ATK_CFLAGS)\
-		      -I$(top_srcdir)\
-		      -I$(top_srcdir)/atk-adaptor/adaptors\
-		      -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
+		          $(ATK_CFLAGS)       \
+		          $(DBIND_CFLAGS)     \
+		          $(DROUTE_CFLAGS)    \
+		          -I$(top_srcdir)     \
+		          -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
 
-libspiatk_la_LDFLAGS = -no-undefined       \
-		       -module             \
-		       -avoid-version      \
-		       -rpath $(gtkmoduledir)
+libatk_bridge_la_LDFLAGS = -no-undefined  \
+		           -module        \
+		           -avoid-version \
+		           -rpath $(gtkmoduledir)
 
-libspiatk_la_LIBADD = $(DBUS_GLIB_LIBS)			\
-		      $(ATK_LIBS)			\
-		      $(top_builddir)/droute/libdroute.la\
-		      $(top_builddir)/spi-common/libspicommon.la
+libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
+		          $(ATK_LIBS)       \
+		          $(DBIND_LIBS)	    \
+		          $(DROUTE_LIBS)    \
+		          $(top_builddir)/common/libspicommon.la
 
-libspiatk_la_SOURCES =		\
+libatk_bridge_la_SOURCES =	\
 	accessible-adaptor.c	\
 	accessible-marshaller.c	\
 	accessible-marshaller.h	\
 	accessible-register.c	\
 	accessible-register.h	\
 	action-adaptor.c	\
-	adaptor.h		\
+	adaptors.h		\
 	application-adaptor.c	\
 	bridge.c		\
 	bridge.h		\
@@ -43,3 +49,15 @@ libspiatk_la_SOURCES =		\
 	tree-adaptor.c		\
 	tree-adaptor.h		\
 	value-adaptor.c
+
+if RELOCATE
+gtkpathdir = $(gtkmoduledir)/..
+gnomeautostartdir = $(datadir)/gnome/autostart
+gnomeautostart_DATA = atk-bridge.desktop
+EXTRA_DIST = atk-bridge.desktop.in
+CLEANFILES = $(gnome_autostart_DATA)
+
+%.desktop: %.desktop.in Makefile.am
+	sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
+	< $< > $@
+endif