[g-a-devel]gail build patch ...

[Michael Meeks <michael ximian com>]

Hi Bill,

	Just uploaded the release; here's the patch.

	Regards,

		Michael.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/at-spi/ChangeLog,v
retrieving revision 1.178
diff -u -p -u -r1.178 ChangeLog
--- ChangeLog	27 Mar 2002 16:24:21 -0000	1.178
+++ ChangeLog	27 Mar 2002 17:08:40 -0000
@@ -1,3 +1,13 @@
+2002-03-27  Michael Meeks  <michael ximian com>
+
+	* Version 0.10.0
+
+	* util/Makefile.am (INCLUDES): fix.
+	(DONT_DIST_SOURCE): don't distribute the
+	generated files.
+
+	* libspi/Makefile.am (dist-hook): ditto.
+
 2002-03-27  Padraig O'Briain  <padraig obriain sun com>
 
 	* libspi/hypertext.c:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/at-spi/configure.in,v
retrieving revision 1.35
diff -u -p -u -r1.35 configure.in
--- configure.in	11 Mar 2002 22:00:09 -0000	1.35
+++ configure.in	27 Mar 2002 17:08:41 -0000
@@ -1,7 +1,7 @@
 AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=0
-AT_SPI_MINOR_VERSION=9
+AT_SPI_MINOR_VERSION=10
 AT_SPI_MICRO_VERSION=0
 AT_SPI_INTERFACE_AGE=0
 AT_SPI_BINARY_AGE=0
@@ -97,7 +97,7 @@ PKG_CHECK_MODULES(LIBSPI, \
 	libbonobo-2.0 >= 1.107.0 \
 	atk >= 0.10 \
 	gtk+-2.0 >= 1.3.12 \
-	gail >= 0.6)
+	gail >= 0.11)
 AC_SUBST(LIBSPI_LIBS)
 AC_SUBST(LIBSPI_CFLAGS)
 
@@ -111,16 +111,16 @@ AC_SUBST(REGISTRYD_CFLAGS)
 PKG_CHECK_MODULES(TESTS, \
 	libbonobo-2.0 >= 1.107.0 \
 	atk >= 0.10 \
-	gtk+-2.0 >= 1.3.12 \
-	gail >= 0.6)
+	gtk+-2.0 >= 2.0.0 \
+	gail >= 0.11)
 AC_SUBST(TESTS_LIBS)
 AC_SUBST(TESTS_CFLAGS)
 
 PKG_CHECK_MODULES(UTILS, \
 	libbonobo-2.0 >= 1.107.0 \
-	gtk+-2.0 >= 1.3.12 \
-	gdk-pixbuf-2.0 >= 1.3.0
-	gdk-pixbuf-xlib-2.0 >= 1.3.0)
+	gtk+-2.0 >= 2.0.0 \
+	gdk-pixbuf-2.0 >= 2.0.0
+	gdk-pixbuf-xlib-2.0 >= 2.0.0)
 AC_SUBST(UTILS_LIBS)
 AC_SUBST(UTILS_CFLAGS)
 
@@ -132,7 +132,7 @@ AC_SUBST(ATK_BRIDGE_CFLAGS)
 
 PKG_CHECK_MODULES(LIBCSPI, \
 	libbonobo-2.0 >= 1.107.0 \
-	atk >= 0.10)
+	atk >= 1.0.0)
 AC_SUBST(LIBCSPI_LIBS)
 AC_SUBST(LIBCSPI_CFLAGS)
 
Index: libspi/Makefile.am
===================================================================
RCS file: /cvs/gnome/at-spi/libspi/Makefile.am,v
retrieving revision 1.27
diff -u -p -u -r1.27 Makefile.am
--- libspi/Makefile.am	26 Feb 2002 18:30:53 -0000	1.27
+++ libspi/Makefile.am	27 Mar 2002 17:08:41 -0000
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = libspi.la
 
-INCLUDES = -I $(top_srcdir)           \
-           -I $(top_builddir)         \
+INCLUDES = -I$(top_srcdir)	\
+           -I$(top_builddir)	\
            $(LIBSPI_CFLAGS)
 
 LDFLAGS = $(LIBSPI_LIBS) $(XTST_LIBS) @LT_VERSION_INFO@
@@ -103,3 +103,10 @@ Accessibility_module_la_LDFLAGS = \
 	-export-dynamic -module
 Accessibility_module_la_SOURCES = \
 	Accessibility-imodule.c
+
+DONT_DIST_SOURCE = $(IDL_OUT)
+
+dist-hook:
+	for file in $(DONT_DIST_SOURCE) ; do \
+	    rm -f $(distdir)/$$file ; \
+	done
Index: util/Makefile.am
===================================================================
RCS file: /cvs/gnome/at-spi/util/Makefile.am,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile.am
--- util/Makefile.am	11 Mar 2002 15:30:27 -0000	1.6
+++ util/Makefile.am	27 Mar 2002 17:08:41 -0000
@@ -30,19 +30,21 @@ magnifier_SOURCES = magnifier.c \
 	Magnifier-common.c
 
 mag_control_SOURCES = mag_control.c \
-	mag_client.h\
+	mag_client.h		\
 	Magnifier-common.c	\
 	Magnifier-stubs.c
 
-INCLUDES =            \
-	   $(UTILS_CFLAGS) \
-	   -I$(top_srcdir)/util/idl
+INCLUDES = \
+	$(UTILS_CFLAGS)		\
+	-I$(top_srcdir)		\
+	-I$(top_builddir)	\
+	-I$(top_srcdir)/util/idl
 
 CFLAGS += $(UTILS_CFLAGS) 
 
 IDL_OUT = Magnifier.h Magnifier-skels.c Magnifier-stubs.c Magnifier-common.c
 
-IDL = $(idl_DATA)
+IDL = $(top_srcdir)/util/$(idl_DATA)
 
 BUILT_SOURCES = $(IDL_OUT)
 CLEANFILES+=$(IDL_OUT)
@@ -64,3 +66,10 @@ EXTRA_DIST = Accessibility_Util.server.i
 
 $(IDL_OUT) : $(IDL) $(ORBIT_IDL)
 	$(ORBIT_IDL) $(IDLFLAGS) $(IDL)
+
+DONT_DIST_SOURCE = $(IDL_OUT)
+
+dist-hook:
+	for file in $(DONT_DIST_SOURCE) ; do \
+	    rm -f $(distdir)/$$file ; \
+	done

-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot