2001-11-13 Michael Meeks <michael@ximian.com>

	* Makefile.am: dist & install at-spi-1.0.pc

	* libspi/Makefile.am: install into at-spi-1.0

	* idl/Makefile.am (idldir): install into at-spi-1.0

	* at-spi-1.0.pc.in: add.

	* configure.in: build it.

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

diff --git a/ChangeLog b/ChangeLog
index 96b7cd6..28c3cf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-11-13  Michael Meeks  <michael@ximian.com>
+
+       * Makefile.am: dist & install at-spi-1.0.pc
+
+       * libspi/Makefile.am: install into at-spi-1.0
+
+       * idl/Makefile.am (idldir): install into at-spi-1.0
+
+       * at-spi-1.0.pc.in: add.
+
+       * configure.in: build it.
+
 2001-11-12  Bill Haneman <bill.haneman@sun.com>
 
         * test/keysynth-demo.c:

diff --git a/Makefile.am b/Makefile.am
index 1a58c83..ec14171 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,10 @@
-SUBDIRS=po docs idl libspi registryd at-bridge cspi util test
+SUBDIRS = po docs idl libspi registryd at-bridge cspi util test
 
-EXTRA_DIST= xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = at-spi-1.0.pc
+
+EXTRA_DIST = \
+       xml-i18n-extract.in \
+       xml-i18n-merge.in   \
+       xml-i18n-update.in  \
+       at-spi-1.0.pc.in

diff --git a/at-spi-1.0.pc.in b/at-spi-1.0.pc.in
new file mode 100644 (file)
index 0000000..4631669
--- /dev/null
+++ b/at-spi-1.0.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+idldir=@datadir@/idl/at-spi-2.0
+
+Name: at-spi
+Description: Accessibility Technology software
+Requires: libbonobo-2.0 atk gtk+-2.0
+Version: @VERSION@
+Libs: -L${libdir} -lspi
+Cflags: -I${includedir}/at-spi-1.0

diff --git a/configure.in b/configure.in
index 55383b0..2b8b2ea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -126,6 +126,7 @@ AC_MSG_ERROR([You must have popt 1.5 or greater to compile the utilities.]))
 
 AC_OUTPUT([
 Makefile
+at-spi-1.0.pc
 po/Makefile.in
 docs/Makefile
 idl/Makefile

diff --git a/idl/Makefile.am b/idl/Makefile.am
index d6a0982..0927f6e 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,4 @@
-idldir = $(datadir)/idl
+idldir = $(datadir)/idl/at-spi-1.0
 
 idl_DATA = Accessibility.idl\
           Accessible.idl   \

diff --git a/libspi/Makefile.am b/libspi/Makefile.am
index 82cf5d5..600b257 100644 (file)
--- a/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@ -12,7 +12,7 @@ DEBUG_CFLAGS=-DSPI_DEBUG
 
 CFLAGS += $(DEBUG_CFLAGS)
 
-libspiincludedir = $(includedir)/libspi
+libspiincludedir = $(includedir)/at-spi-1.0/libspi
 
 libspiinclude_HEADERS = accessible.h       \
                        action.h\