X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2FMakefile.am;h=a7e9df96e742eaee2c2bf0ade6db75519dc9bb0e;hb=b5346d3452088bb6faeb06c33eb34b9699847757;hp=f3d02aace0bdb7dd4b3e6367b17cf01c6d233213;hpb=e07aeb10fff4c7802393f5cbe8460d1097cbec18;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/libspi/Makefile.am b/libspi/Makefile.am
index f3d02aa..a7e9df9 100644
--- a/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@ -2,48 +2,62 @@ lib_LTLIBRARIES = libspi.la
 
 INCLUDES = -I $(top_srcdir)           \
            -I $(top_builddir)         \
-           -I $(top_srcdir)/libspi    \
-           -I $(top_builddir)/libspi  \
            $(LIBSPI_CFLAGS)
 
-LDFLAGS = $(LIBSPI_LIBS) @LT_VERSION_INFO@
+LDFLAGS = $(LIBSPI_LIBS) $(XTST_LIBS) @LT_VERSION_INFO@
 
-DEBUG_CFLAGS=-DSPI_DEBUG
+#DEBUG_CFLAGS=-DSPI_DEBUG
 
 CFLAGS += $(DEBUG_CFLAGS)
 
-libspiincludedir = $(includedir)/libspi
+libspiincludedir = $(includedir)/at-spi-1.0/libspi
 
-libspiinclude_HEADERS = accessible.h       \
-			action.h\
-                        application.h      \
-			component.h\
-                        desktop.h          \
+libspiinclude_HEADERS = Accessibility.h \
+			accessible.h \
+			eventlistener.h \
+			action.h \
+                        application.h \
+			base.h \
+			component.h \
 			editabletext.h\
 			hyperlink.h\
 			hypertext.h\
-			image.h\
-			selection.h\
-			table.h\
-			text.h\
-			value.h\
-                        listener.h         \
-			accessibleeventlistener.h	\
-                        registry.h         \
-                        Accessibility.h
+			image.h \
+			keystrokelistener.h \
+			keymasks.h \
+			libspi.h \
+                        listener.h \
+			relation.h \
+			selection.h \
+			table.h \
+			text.h \
+			value.h
 
 IDL_OUT = Accessibility.h Accessibility-stubs.c Accessibility-skels.c Accessibility-common.c
 
-IDL = \
-	$(top_srcdir)/idl/Accessibility.idl \
-	$(top_srcdir)/idl/Accessible.idl    \
-	$(top_srcdir)/idl/Application.idl   \
-	$(top_srcdir)/idl/Desktop.idl       \
-	$(top_srcdir)/idl/Event.idl         \
-	$(top_srcdir)/idl/Registry.idl	    \
-	$(top_srcdir)/idl/Relation.idl      \
-	$(top_srcdir)/idl/Role.idl          \
-	$(top_srcdir)/idl/State.idl
+IDL_DEPS = \
+	$(top_srcdir)/idl/Accessibility.idl			\
+	$(top_srcdir)/idl/Accessibility_Accessible.idl		\
+	$(top_srcdir)/idl/Accessibility_Action.idl		\
+	$(top_srcdir)/idl/Accessibility_Application.idl		\
+	$(top_srcdir)/idl/Accessibility_Component.idl		\
+	$(top_srcdir)/idl/Accessibility_Desktop.idl		\
+	$(top_srcdir)/idl/Accessibility_EditableText.idl	\
+	$(top_srcdir)/idl/Accessibility_Event.idl		\
+	$(top_srcdir)/idl/Accessibility_Hyperlink.idl		\
+	$(top_srcdir)/idl/Accessibility_Hypertext.idl		\
+	$(top_srcdir)/idl/Accessibility_Image.idl		\
+	$(top_srcdir)/idl/Accessibility_Registry.idl		\
+	$(top_srcdir)/idl/Accessibility_Relation.idl		\
+	$(top_srcdir)/idl/Accessibility_Role.idl		\
+	$(top_srcdir)/idl/Accessibility_Selection.idl		\
+	$(top_srcdir)/idl/Accessibility_State.idl		\
+	$(top_srcdir)/idl/Accessibility_StreamableContent.idl	\
+	$(top_srcdir)/idl/Accessibility_Table.idl		\
+	$(top_srcdir)/idl/Accessibility_Text.idl		\
+	$(top_srcdir)/idl/Accessibility_Value.idl
+
+
 
 BUILT_SOURCES = $(IDL_OUT) Accessibility-imodule.c
 CLEANFILES+=$(IDL_OUT) Accessibility-imodule.c
@@ -54,10 +68,9 @@ libspi_la_SOURCES = accessible.c         \
 		    action.h\
 		    application.c        \
                     application.h        \
+		    base.c		 \
 		    component.c		 \
 		    component.h		 \
-                    desktop.c            \
-                    desktop.h            \
 		    editabletext.c\
 		    editabletext.h\
 		    hyperlink.c\
@@ -66,6 +79,10 @@ libspi_la_SOURCES = accessible.c         \
 		    hypertext.h\
 		    image.c\
 		    image.h\
+		    keystrokelistener.c\
+		    keystrokelistener.h\
+		    relation.c\
+		    relation.h\
 		    selection.c\
 		    selection.h\
 		    table.c\
@@ -76,10 +93,8 @@ libspi_la_SOURCES = accessible.c         \
 		    value.h\
                     listener.c           \
                     listener.h           \
-		    accessibleeventlistener.c	\
-		    accessibleeventlistener.h	\
-                    registry.c           \
-                    registry.h           \
+		    eventlistener.c	 \
+		    keymasks.h		\
                     $(IDL_OUT)
 
 IDLFLAGS = -I$(BONOBO_ACTIVATION_IDL_DIR) \
@@ -87,10 +102,10 @@ IDLFLAGS = -I$(BONOBO_ACTIVATION_IDL_DIR) \
 	   -I$(top_srcdir)/idl            \
 	   --add-imodule
 
-$(IDL_OUT) Accessibility-imodule.c : $(IDL) $(ORBIT_IDL)
+$(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL)
 	$(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl
 
-orbittypelibdir = $(libdir)/orbit
+orbittypelibdir = $(libdir)/orbit-2.0
 orbittypelib_LTLIBRARIES = Accessibility_module.la
 
 Accessibility_module_la_LDFLAGS = \