projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2008-12-18 Mark Doffman <mark.doffman@codethink.co.uk>
[platform/core/uifw/at-spi2-atk.git]
/
cspi
/
Makefile.am
diff --git
a/cspi/Makefile.am
b/cspi/Makefile.am
index
b9907c2
..
1cb9033
100644
(file)
--- a/
cspi/Makefile.am
+++ b/
cspi/Makefile.am
@@
-1,20
+1,11
@@
-SUBDIRS = bonobo
-
-NULL=
-
lib_LTLIBRARIES = libcspi.la
lib_LTLIBRARIES = libcspi.la
-INCLUDES = -I $(top_srcdir) \
- -I $(top_builddir) \
- $(X_CFLAGS) \
- $(WARN_CFLAGS) \
- $(LIBCSPI_CFLAGS)
+libcspi_la_LDFLAGS = @LDFLAGS@ @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@ -no-undefined
-libcspi_la_
LDFLAGS = @LDFLAGS@ ../libspi/libspi.la $(LIBCSPI_LIBS) @LT_VERSION_INFO@ @LIBTOOL_EXPORT_OPTIONS@
+libcspi_la_
CFLAGS = $(DBUS_GLIB_CFLAGS) $(ATK_CFLAGS) -I$(top_srcdir)
-LDADD = \
- $(top_srcdir)/libspi/libspi.la \
- $(LIBCSPI_LIBS) $(X_LIBS)
+LDADD = $(DBUS_GLIB_LIBS) \
+ $(top_builddir)/spi-common/libspicommon.la
libcspidir = $(includedir)/at-spi-1.0/cspi
libcspi_HEADERS = \
libcspidir = $(includedir)/at-spi-1.0/cspi
libcspi_HEADERS = \
@@
-26,23
+17,26
@@
libcspi_HEADERS = \
libcspi_la_SOURCES = \
cspi-lowlevel.h \
libcspi_la_SOURCES = \
cspi-lowlevel.h \
- spi_accessible.c \
- spi_action.c \
- spi_application.c \
- spi_component.c \
- spi_editabletext.c \
- spi_event.c \
- spi_hyperlink.c \
- spi_hypertext.c \
- spi_image.c \
- spi_main.c \
- spi-private.h \
- spi_registry.c \
- spi_selection.c \
- spi_streamablecontent.c \
- spi_table.c \
- spi_text.c \
- spi_value.c
+ spi-accessible.c \
+ spi-action.c \
+ spi-application.c \
+ spi-component.c \
+ spi-editabletext.c \
+ spi-event.c \
+ spi-hyperlink.c \
+ spi-hypertext.c \
+ spi-image.c \
+ spi-listener.c \
+ spi-main.c \
+ spi-registry.c \
+ spi-selection.c \
+ spi-streamablecontent.c \
+ spi-table.c \
+ spi-text.c \
+ spi-value.c \
+ spi-private.h
libcspi_la_LIBADD = \
libcspi_la_LIBADD = \
- bonobo/libcspi-bonobo.la
+ $(top_builddir)/spi-common/libspicommon.la \
+ $(top_builddir)/dbind/libdbind.la\
+ $(LIBCSPI_LIBS) $(X_LIBS)