* libspi/Makefile.am,
registryd/Makefile.am,
at-bridge/Makefile.am.
test/Makefile.am, configure.in:
reverse previous changes.
* /idl/Image.idl: fix typo.
* test/Makefile.am: put DEBUG_FLAGS
in CFLAGS.
git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@25
e2bd861d-eb25-0410-b326-
f6ed22b6b98c
2001-08-15 Mark McLoughlin <mark@skynet.ie>
+ * libspi/Makefile.am,
+ registryd/Makefile.am,
+ at-bridge/Makefile.am.
+ test/Makefile.am, configure.in:
+ reverse previous changes.
+
+ * /idl/Image.idl: fix typo.
+
+ * test/Makefile.am: put DEBUG_FLAGS
+ in CFLAGS.
+
+2001-08-15 Mark McLoughlin <mark@skynet.ie>
+
* test/app.c: use atgv[0] instead of
g_type_prgname.
-I $(top_srcdir)/libspi \
-I $(top_builddir)/libspi \
-I $(top_builddir)/at-bridge \
- $(AT_COMMON_CFLAGS)
+ $(AT_BRIDGE_CFLAGS)
-LDADD = $(AT_COMMON_LIBS) ../libspi/libspi.la
+DEPS = \
+ $(libatk) \
+ $(libbonobo-2) \
+ $(liboaf-2) \
+ $(libORBit-2) \
+ $(libat-spi)
+
+
+LDFLAGS = -no-undefined \
+ @DEP_LIBS@
+
+libat_bridge_la_LIBADD = $(AT_BRIDGE_LIBS) ../libspi/libspi.la
+
+CFLAGS += $(AT_BRIDGE_CFLAGS)
-I $(top_srcdir)/libspi \
-I $(top_builddir)/libspi \
-I $(top_builddir)/at-bridge \
- $(AT_COMMON_CFLAGS)
+ $(AT_BRIDGE_CFLAGS)
-LDADD = $(AT_COMMON_LIBS) ../libspi/libspi.la
+DEPS = \
+ $(libatk) \
+ $(libbonobo-2) \
+ $(liboaf-2) \
+ $(libORBit-2) \
+ $(libat-spi)
+
+
+LDFLAGS = -no-undefined \
+ @DEP_LIBS@
+
+libat_bridge_la_LIBADD = $(AT_BRIDGE_LIBS) ../libspi/libspi.la
+
+CFLAGS += $(AT_BRIDGE_CFLAGS)
AC_SUBST(LIBSPI_LIBS)
AC_SUBST(LIBSPI_CFLAGS)
-PKG_CHECK_MODULES(AT_COMMON, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 atk >= 0.2)
-AC_SUBST(AT_COMMON_LIBS)
-AC_SUBST(AT_COMMON_CFLAGS)
+PKG_CHECK_MODULES(REGISTRYD, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 atk >= 0.2)
+AC_SUBST(REGISTRYD_LIBS)
+AC_SUBST(REGISTRYD_CFLAGS)
+
+PKG_CHECK_MODULES(TESTS, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 ORBit-2.0 atk >= 0.2)
+AC_SUBST(TESTS_LIBS)
+AC_SUBST(TESTS_CFLAGS)
+
+PKG_CHECK_MODULES(AT_BRIDGE, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0 ORBit-2.0 atk >= 0.2)
+AC_SUBST(AT_BRIDGE_LIBS)
+AC_SUBST(AT_BRIDGE_CFLAGS)
dnl orbit-idl.
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
interface Image : Bonobo::Unknown {
readonly attribute string imageDescription;
readonly attribute long height;
- readonly attribute long widthl
+ readonly attribute long width;
readonly attribute long xpos;
readonly attribute long ypos;
};
interface Image : Bonobo::Unknown {
readonly attribute string imageDescription;
readonly attribute long height;
- readonly attribute long widthl
+ readonly attribute long width;
readonly attribute long xpos;
readonly attribute long ypos;
};
lib_LTLIBRARIES = libspi.la
-DEBUG_CFLAGS=-DSPI_DEBUG
-
INCLUDES = -I $(top_srcdir) \
-I $(top_builddir) \
-I $(top_srcdir)/libspi \
-I $(top_builddir)/libspi \
- $(LIBSPI_CFLAGS) \
- $(DEBUG_CFLAGS)
+ $(LIBSPI_CFLAGS)
+
+LDFLAGS = $(LIBSPI_LIBS) @LT_VERSION_INFO@
+
+DEBUG_CFLAGS=-DSPI_DEBUG
-LDADD = $(LIBSPI_LIBS) @LT_VERSION_INFO@
+CFLAGS += $(DEBUG_CFLAGS)
libspiincludedir = $(includedir)/libspi
-I$(top_builddir) \
-I$(top_builddir)/libspi \
-I$(top_srcdir)/libspi \
- $(AT_COMMON_CFLAGS)
-
-LDADD = ../libspi/libspi.la $(AT_COMMON_LIBS)
+ $(REGISTRYD_CFLAGS)
registryd_SOURCES = registryd.c
+LDADD = ../libspi/libspi.la $(REGISTRYD_LIBS)
+
oafinfodir = $(datadir)/oaf
oafinfo_DATA = Accessibility_Registry.oaf
app_SOURCES = app.c
-DEBUG_CFLAGS=-DSPI_DEBUG
-
INCLUDES = -I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/libspi \
-I$(top_builddir)/libspi \
- $(AT_COMMON_CFLAGS) \
- $(DEBUG_CFLAGS)
+ $(TESTS_CFLAGS)
+
+DEBUG_CFLAGS=-DSPI_DEBUG
+
+CFLAGS += $(TESTS_CFLAGS) $(DEBUG_CFLAGS)
-LDADD = ../libspi/libspi.la $(AT_COMMON_LIBS)
+LDADD = ../libspi/libspi.la $(TESTS_LIBS)