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.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@25 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 2325d4c..e1b69cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 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.
 

diff --git a/at-bridge/Makefile.am b/at-bridge/Makefile.am
index 8badc27..c5d984e 100644 (file)
--- a/at-bridge/Makefile.am
+++ b/at-bridge/Makefile.am
@@ -9,6 +9,19 @@ INCLUDES = -I $(top_srcdir) \
           -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)

diff --git a/atk-bridge/Makefile.am b/atk-bridge/Makefile.am
index 8badc27..c5d984e 100644 (file)
--- a/atk-bridge/Makefile.am
+++ b/atk-bridge/Makefile.am
@@ -9,6 +9,19 @@ INCLUDES = -I $(top_srcdir) \
           -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)

diff --git a/configure.in b/configure.in
index 383ff63..4b46c6f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,9 +55,17 @@ PKG_CHECK_MODULES(LIBSPI, bonobo-activation-2.0 >= 0.7.0 libbonobo-2.0 >= 1.97.0
 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`"

diff --git a/idl/Accessibility_Image.idl b/idl/Accessibility_Image.idl
index 8e4ed20..b25aa5c 100644 (file)
--- a/idl/Accessibility_Image.idl
+++ b/idl/Accessibility_Image.idl
@@ -25,7 +25,7 @@ module Accessibility {
   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;
   };

diff --git a/idl/Image.idl b/idl/Image.idl
index 8e4ed20..b25aa5c 100644 (file)
--- a/idl/Image.idl
+++ b/idl/Image.idl
@@ -25,7 +25,7 @@ module Accessibility {
   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;
   };

diff --git a/libspi/Makefile.am b/libspi/Makefile.am
index 09c8c16..618abda 100644 (file)
--- a/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@ -1,15 +1,16 @@
 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
 

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index ccd864c..19017a2 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -4,12 +4,12 @@ INCLUDES = -I$(top_srcdir)          \
            -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
 

diff --git a/test/Makefile.am b/test/Makefile.am
index c5b6c30..0c48983 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,13 +6,14 @@ at_SOURCES = at.c
 
 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)