diff options
author | Mark Doffman <mdoff@altair-voyager.(none)> | 2009-07-05 11:42:13 +0100 |
---|---|---|
committer | Mark Doffman <mdoff@altair-voyager.(none)> | 2009-07-05 11:42:13 +0100 |
commit | 3e0e2778b12d807476ad2b50be1408bd20ae6395 (patch) | |
tree | 6e63889f0de34570ff0005c1c051fb157545ebfe | |
parent | 41028a909d5ec0d04f7218564d90a32db81f98a3 (diff) | |
download | at-spi2-core-3e0e2778b12d807476ad2b50be1408bd20ae6395.tar.gz |
2009-07-05 Mark Doffman <mark.doffman@codethink.co.uk>
Add pkgconfig files for the dbind and droute libraries.
-rw-r--r-- | INSTALL | 10 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | pkgconfig/Makefile.am | 3 | ||||
-rw-r--r-- | pkgconfig/dbind-0.1-uninstalled.pc.in | 8 | ||||
-rw-r--r-- | pkgconfig/dbind-0.1.pc.in | 9 | ||||
-rw-r--r-- | pkgconfig/droute-0.1-uninstalled.pc.in | 8 | ||||
-rw-r--r-- | pkgconfig/droute-0.1.pc.in | 9 | ||||
-rw-r--r-- | registryd/Makefile.am | 2 | ||||
-rw-r--r-- | xml/Accessibility.xml | 4 |
10 files changed, 49 insertions, 13 deletions
@@ -1,13 +1,13 @@ Install procedure ----------------- - % gzip -cd at-spi-1.9.0.tar.gz | tar xvf - # unpack the sources - % cd at-spi-1.9.0 # change to the toplevel directory - % ./configure # run the `configure' script - % make # build at-spi + % gzip -cd at-spi-core-2.0.0.tar.gz | tar xvf - # unpack the sources + % cd at-spi-core-2.0.0 # change to the toplevel directory + % ./configure # run the `configure' script + % make # build at-spi-core [ Become root if necessary ] - % make install # install at-spi + % make install # install at-spi-core Requirements ------------ diff --git a/Makefile.am b/Makefile.am index b9b105c5..f5f8edb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS=xml tools dbind droute registryd +SUBDIRS=pkgconfig xml tools dbind droute registryd ACLOCAL_AMFLAGS=-I m4 - -pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 6501bf52..02954914 100644 --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,11 @@ CPPFLAGS=$orig_CPPFLAGS AC_SUBST(LIBTOOL_EXPORT_OPTIONS) AC_CONFIG_FILES([Makefile + pkgconfig/dbind-0.1.pc + pkgconfig/dbind-0.1-uninstalled.pc + pkgconfig/droute-0.1.pc + pkgconfig/droute-0.1-uninstalled.pc + pkgconfig/Makefile xml/Makefile tools/Makefile droute/Makefile diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am new file mode 100644 index 00000000..efba9ff9 --- /dev/null +++ b/pkgconfig/Makefile.am @@ -0,0 +1,3 @@ +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = dbind-0.1.pc droute-0.1.pc +EXTRA_DIST = dbind-0.1.pc droute-0.1.pc diff --git a/pkgconfig/dbind-0.1-uninstalled.pc.in b/pkgconfig/dbind-0.1-uninstalled.pc.in new file mode 100644 index 00000000..8eedc1ff --- /dev/null +++ b/pkgconfig/dbind-0.1-uninstalled.pc.in @@ -0,0 +1,8 @@ +top_builddir=@top_builddir@ + +Name: dbind (Uninstalled) +Description: Client side bindings helper library for libdbus +Requires: libdbus-1.0 +Version: @DBIND_VERSION@ +Libs: ${top_builddir}/dbind/libdbind.la +Cflags: -I${top_builddir} @DBUS_CFLAGS@ diff --git a/pkgconfig/dbind-0.1.pc.in b/pkgconfig/dbind-0.1.pc.in new file mode 100644 index 00000000..d26ae302 --- /dev/null +++ b/pkgconfig/dbind-0.1.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +includedir=@includedir@ + +Name: dbind +Description: Client side bindings helper library for libdbus +Requires: libdbus-1.0 +Version: @DBIND_VERSION@ +Libs: -ldbind +Cflags: -I${includedir}/dbind-@DBIND_VERSION@ @DBUS_CFLAGS@ diff --git a/pkgconfig/droute-0.1-uninstalled.pc.in b/pkgconfig/droute-0.1-uninstalled.pc.in new file mode 100644 index 00000000..825a142f --- /dev/null +++ b/pkgconfig/droute-0.1-uninstalled.pc.in @@ -0,0 +1,8 @@ +top_builddir=@top_builddir@ + +Name: droute (Uninstalled) +Description: Server side bindings helper library for libdbus +Requires: libdbus-1.0 +Version: @DROUTE_VERSION@ +Libs: ${top_builddir}/droute/libdroute.la +Cflags: -I${top_builddir} @DBUS_CFLAGS@ diff --git a/pkgconfig/droute-0.1.pc.in b/pkgconfig/droute-0.1.pc.in new file mode 100644 index 00000000..0a69ab03 --- /dev/null +++ b/pkgconfig/droute-0.1.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +includedir=@includedir@ + +Name: droute +Description: Server side bindings helper library for libdbus +Requires: libdbus-1.0 +Version: @DROUTE_VERSION@ +Libs: -ldroute +Cflags: -I${includedir}/droute-@DROUTE_VERSION@ @DBUS_CFLAGS@ diff --git a/registryd/Makefile.am b/registryd/Makefile.am index 254216f0..39ffb0a9 100644 --- a/registryd/Makefile.am +++ b/registryd/Makefile.am @@ -22,7 +22,7 @@ at_spi_registryd_SOURCES = \ de-marshaller.c \ de-types.h \ keymasks.h \ - paths.hi \ + paths.h \ registry-main.c \ registry.c \ registry.h \ diff --git a/xml/Accessibility.xml b/xml/Accessibility.xml index 7c8f3f80..b7ad9c71 100644 --- a/xml/Accessibility.xml +++ b/xml/Accessibility.xml @@ -25,7 +25,6 @@ Accessibility::Hypertext\n Accessibility::Image\n Accessibility::Selection\n - Accessibility::StreamableContent\n Accessibility::Table\n Accessibility::Text\n Accessibility::EditableText\n @@ -76,7 +75,6 @@ <xi:include href="org.freedesktop.atspi.Hyperlink.xml"/> <xi:include href="org.freedesktop.atspi.Image.xml"/> <xi:include href="org.freedesktop.atspi.Selection.xml"/> -<xi:include href="org.freedesktop.atspi.StreamableContent.xml"/> <xi:include href="org.freedesktop.atspi.Table.xml"/> <xi:include href="org.freedesktop.atspi.Text.xml"/> <xi:include href="org.freedesktop.atspi.Tree.xml"/> @@ -97,6 +95,4 @@ <xi:include href="org.freedesktop.atspi.DeviceEventListener.xml"/> <xi:include href="org.freedesktop.atspi.Relation.xml"/> <xi:include href="org.freedesktop.atspi.Role.xml"/> -<xi:include href="org.freedesktop.atspi.LoginHelper.xml"/> -<xi:include href="org.freedesktop.atspi.Selector.xml"/> </tp:spec> |