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
Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
[platform/core/uifw/at-spi2-atk.git]
/
cspi
/
Makefile.am
diff --git
a/cspi/Makefile.am
b/cspi/Makefile.am
index
e34da2b
..
1b2275c
100644
(file)
--- a/
cspi/Makefile.am
+++ b/
cspi/Makefile.am
@@
-1,19
+1,11
@@
-SUBDIRS = bonobo
-
-NULL=
-
lib_LTLIBRARIES = libcspi.la
lib_LTLIBRARIES = libcspi.la
-INCLUDES = -I $(top_srcdir) \
- -I $(top_builddir) \
- $(X_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@
+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 = \
@@
-25,23
+17,25
@@
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
-component.c
\
+ spi
-editabletext.c
\
+ spi
-event.c
\
+ spi
-hyperlink.c
\
+ spi
-hypertext.c
\
+ spi
-listener.c
\
+ spi
-main.c
\
+ spi
-registry.c
\
+ spi-
selection.c
\
+ spi
-stateset.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)