X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2FMakefile.am;h=2bb3c6b0b6420dfba4a3eda908a25ce08d6ae30f;hp=2a6cca8678e16909be5016c98f1a55744a7b3639;hb=6b63c523fac3c4bf721c143b0402d767d2fc5801;hpb=99d800aa54ae67cd70bb44bf6749e3a90876e6da

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 2a6cca8..2bb3c6b 100644
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,66 +1,53 @@
-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
+SUBDIRS= adaptors . gtk-2.0
 
-libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
-		          $(ATK_CFLAGS)       \
-		          $(DBIND_CFLAGS)     \
-		          $(DROUTE_CFLAGS)    \
-		          -I$(top_srcdir)     \
-		          -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\"
+lib_LTLIBRARIES = libatk-bridge-2.0.la
 
-libatk_bridge_la_LDFLAGS = -no-undefined  \
-		           -module        \
-		           -avoid-version \
-		           -rpath $(gtkmoduledir)
+libatk_bridge_2_0_la_CFLAGS = \
+	$(DBUS_CFLAGS)    \
+	$(ATK_CFLAGS)     \
+	$(ATSPI_CFLAGS)   \
+	-I$(top_srcdir)   \
+	-I$(top_srcdir)/atk-adaptor/adaptors \
+	$(P2P_CFLAGS)
 
-libatk_bridge_la_LIBADD = $(DBUS_GLIB_LIBS) \
-		          $(ATK_LIBS)       \
-		          $(DBIND_LIBS)	    \
-		          $(DROUTE_LIBS)    \
-			  $(X_LIBS)         \
-		          $(top_builddir)/droute/libdroute.la \
-		          $(top_builddir)/dbind/libdbind.la \
-		          $(top_builddir)/common/libspicommon.la
+atkbridgeincludedir = $(pkgincludedir)/2.0/
+atkbridgeinclude_HEADERS = atk-bridge.h
 
-libatk_bridge_la_SOURCES =	\
-	accessible-adaptor.c	\
-	accessible-marshaller.c	\
-	accessible-marshaller.h	\
-	accessible-register.c	\
-	accessible-register.h	\
-	action-adaptor.c	\
-	adaptors.h		\
-	application-adaptor.c	\
-	bridge.c		\
-	bridge.h		\
-	collection-adaptor.c	\
-	component-adaptor.c	\
-	document-adaptor.c	\
-	editabletext-adaptor.c	\
-	event.c			\
-	event.h			\
-	hyperlink-adaptor.c	\
-	hypertext-adaptor.c	\
-	image-adaptor.c		\
-	selection-adaptor.c	\
-	table-adaptor.c		\
-	text-adaptor.c		\
-	tree-adaptor.c		\
-	tree-adaptor.h		\
-	value-adaptor.c
+libatk_bridge_2_0_la_SOURCES =  \
+        accessible-leasing.c    \
+        accessible-leasing.h    \
+        accessible-cache.c      \
+        accessible-cache.h      \
+	accessible-register.c   \
+	accessible-register.h   \
+	accessible-stateset.c   \
+	accessible-stateset.h   \
+	bitarray.h              \
+	introspection.c         \
+	introspection.h         \
+	bridge.c                \
+	bridge.h                \
+	object.c                \
+	object.h                \
+	event.c                 \
+	event.h                 \
+	spi-dbus.c              \
+	spi-dbus.h		\
+	atk-bridge.h
 
-if RELOCATE
-gtkpathdir = $(gtkmoduledir)/..
-gnomeautostartdir = $(datadir)/gnome/autostart
-gnomeautostart_DATA = atk-bridge.desktop
-EXTRA_DIST = atk-bridge.desktop.in
-CLEANFILES = $(gnome_autostart_DATA)
+libatk_bridge_2_0_la_LIBADD = \
+	$(DBUS_LIBS)          \
+	$(GMODULE_LIBS)       \
+	$(ATK_LIBS)           \
+	$(ATSPI_LIBS)         \
+	$(top_builddir)/droute/libdroute.la \
+	$(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la
 
-%.desktop: %.desktop.in Makefile.am
-	sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
-	< $< > $@
-endif
+libatk_bridge_2_0_la_LDFLAGS = \
+	$(LT_VERSION_INFO)                          \
+	-export-symbols $(srcdir)/atkbridge.symbols \
+	-no-undefined                               \
+	$(AM_LDFLAGS)
+
+EXTRA_DIST = Makefile.include \
+	atkbridge.symbols