X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=atspi%2FMakefile.am;h=9944d44272453f854d2fa97d51f3540265cd6efa;hb=29f7a16080f961af341fb827646bf378d4448ec1;hp=28551853ede11d5877bbb6bd73620cb4b0aadf5a;hpb=7afb51e5093fef46c699d92ee8eee94f5b6886fb;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/atspi/Makefile.am b/atspi/Makefile.am
index 2855185..9944d44 100644
--- a/atspi/Makefile.am
+++ b/atspi/Makefile.am
@@ -2,13 +2,15 @@ lib_LTLIBRARIES = libatspi.la
 
 libatspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@ -no-undefined
 
-libatspi_la_CFLAGS = $(DBUS_CFLAGS) \
+libatspi_la_CFLAGS = $(DBUS_CFLAGS) $(AUL_CFLAGS) \
 		    $(DBIND_CFLAGS)     \
 		    $(GLIB_CFLAGS)     \
 		    -I$(top_srcdir)/registryd \
+		    -I$(top_builddir)/registryd \
+                    -I$(top_builddir) \
                     -I$(top_srcdir)
 
-libatspi_la_LIBADD = $(DBUS_LIBS) \
+libatspi_la_LIBADD = $(DBUS_LIBS) $(AUL_LIBS) \
 	$(GOBJ_LIBS) \
 	$(X_LIBS) \
 	$(top_builddir)/dbind/libdbind.la
@@ -44,6 +46,7 @@ atspi-gmain.h \
 	atspi-selection.h \
 	atspi-stateset.h \
 	atspi-table.h \
+	atspi-table-cell.h \
 	atspi-text.h \
 	atspi-types.h \
 	atspi-value.h
@@ -54,6 +57,7 @@ libatspi_la_SOURCES =		\
 	atspi.h	\
 	atspi-accessible.c \
 	atspi-accessible.h \
+	atspi-accessible-private.h \
 	atspi-action.c \
 	atspi-action.h \
 	atspi-application.c \
@@ -97,6 +101,7 @@ libatspi_la_SOURCES =		\
 	atspi-stateset.c \
 	atspi-stateset.h \
 	atspi-table.c \
+	atspi-table-cell.c \
 	atspi-table.h \
 	atspi-text.c \
 	atspi-text.h \
@@ -123,42 +128,37 @@ atspi-enum-types.h: atspi-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS)
 atspi-enum-types.c: atspi-enum-types.c.template $(ENUM_TYPES) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template atspi-enum-types.c.template $(ENUM_TYPES)) > $@
 
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+EXTRA_DIST = \
+	atspi-enum-types.c.template \
+	atspi-enum-types.h.template
+
 if HAVE_INTROSPECTION
-INTROSPECTION_FILES = $(libatspi_la_SOURCES)
-
-Atspi-2.0.gir: $(INTROSPECTION_SCANNER) \
-		libatspi.la \
-		$(INTROSPECTION_FILES)
-	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
-		--namespace Atspi \
-		--nsversion=2.0 \
-		-I$(top_builddir) \
-		-I$(top_srcdir) \
-		--include=GLib-2.0 \
-		--include=GObject-2.0 \
-		--libtool="$(top_builddir)/libtool" \
-		--library=libatspi.la \
-		--library=$(top_builddir)/dbind/libdbind.la \
-		--pkg dbus-1 \
-		--warn-all \
-		--output $@ \
-		$(addprefix $(srcdir)/, $(INTROSPECTION_FILES))
+Atspi-2.0.gir: libatspi.la
+Atspi_2_0_gir_INCLUDES = GLib-2.0 GObject-2.0
+Atspi_2_0_gir_PACKAGES = dbus-1
+Atspi_2_0_gir_EXPORT_PACKAGES = atspi-2
+Atspi_2_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir)
+Atspi_2_0_gir_LIBS = libatspi.la $(top_builddir)/dbind/libdbind.la
+Atspi_2_0_gir_FILES = $(libatspi_la_SOURCES)
+Atspi_2_0_gir_SCANNERFLAGS = --namespace Atspi --nsversion=2.0
+INTROSPECTION_SCANNER_ARGS += --c-include='atspi/atspi.h'
+INTROSPECTION_GIRS += Atspi-2.0.gir
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = Atspi-2.0.gir
+gir_DATA = $(INTROSPECTION_GIRS)
 
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(AM_V_GEN)$(top_builddir)/libtool --mode=execute \
-	    $(INTROSPECTION_COMPILER) \
-	        --includedir=$(srcdir) \
-	        --includedir=. \
-	        $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
-
-typelibsdir = $(libdir)/girepository-1.0/
-typelibs_DATA = $(gir_DATA:.gir=.typelib)
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES = \
     $(gir_DATA) \
-    $(typelibs_DATA)
+    $(typelib_DATA)
 
 endif
+
+-include $(top_srcdir)/git.mk