build fixes for pango, gtk+ and libzvt with automake 1.5

[Bastien Nocera <hadess hadess net>]

Hi,

I think the subject line is pretty descriptive.

The pango and gtk+ problems are problems with some files depending on
generated sources (*marshal* and *enums* files).

The libzvt is the problem with a useless AM_CONDITIONAL.

Patches attached.

Cheers


Index: configure.in
===================================================================
RCS file: /cvs/gnome/libzvt/configure.in,v
retrieving revision 1.7
diff -u -r1.7 configure.in
--- configure.in	2001/09/21 22:31:39	1.7
+++ configure.in	2001/10/17 15:30:21
@@ -21,7 +21,7 @@
 GNOME_COMPILE_WARNINGS
 
 dnl utility conditional
-AM_CONDITIONAL(FALSE, test "x" = "y")
+dnl AM_CONDITIONAL(FALSE, test "x" = "y")
 
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gdk-pixbuf/Makefile.am,v
retrieving revision 1.109
diff -u -r1.109 Makefile.am
--- Makefile.am	2001/09/26 22:09:28	1.109
+++ Makefile.am	2001/10/16 15:53:31
@@ -203,6 +203,7 @@
 #
 libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
 libgdk_pixbuf_1_3_la_SOURCES = @STRIP_BEGIN@ \
+	$(gdk_pixbuf_built_cfiles) \
 	gdk-pixbuf-i18n.h	\
 	gdk-pixbuf.c		\
 	gdk-pixbuf-animation.c	\
@@ -212,7 +213,6 @@
 	gdk-pixbuf-scale.c	\
 	gdk-pixbuf-util.c	\
 	gdk-pixdata.c		\
-	$(gdk_pixbuf_built_cfiles) \
 @STRIP_END@
 libgdk_pixbuf_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
@@ -220,15 +220,15 @@
 @STRIP_END@
 
 libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS)
-libgdk_pixbuf_1_3_la_DEPENDENCIES = $(builtin_objs)
+libgdk_pixbuf_1_3_la_DEPENDENCIES = $(builtin_objs) $(gdk_pixbuf_built_marshal_cfiles)
 
 gdk_pixbuf_headers = 			\
 	gdk-pixbuf.h			\
 	gdk-pixbuf-loader.h
 
 libgdk_pixbufinclude_HEADERS =  	\
+	$(gdk_pixbuf_built_headers)     \
 	$(gdk_pixbuf_headers)		\
-	$(gdk_pixbuf_built_headers)	\
 	gdk-pixbuf-features.h		\
 	gdk-pixdata.h
 
@@ -237,7 +237,8 @@
 	gdk-pixbuf-private.h
 
 gdk_pixbuf_built_headers = gdk-pixbuf-enum-types.h gdk-pixbuf-marshal.h
-gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c 
+gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c
+gdk_pixbuf_built_marshal_cfiles = gdk-pixbuf-marshal.c
 $(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
 
 CLEANFILES =
@@ -266,7 +267,7 @@
 #
 # gdk-pixbuf-enum-types.c
 #
-$(srcdir)/gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile
+$(srcdir)/gdk-pixbuf-enum-types.c: s-enum-types-h @REBUILD@ $(gdk_pixbuf_headers) $(srcdir)/gdk-pixbuf-marshal.c Makefile
 	cd $(srcdir) && glib-mkenums \
 		--fhead "#include <gdk-pixbuf/gdk-pixbuf.h>" \
 		--fprod "\n/* enumerations from \"@filename \" */" \
@@ -298,7 +299,7 @@
 #
 # gdk-pixbuf-marshal.c
 #
-$(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
+$(srcdir)/gdk-pixbuf-marshal.c: stamp-gdk-pixbuf-marshal.h @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
 	case @GLIB_GENMARSHAL@ in									\
 	   .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;;				\
 	   *) glib_genmarshal= GLIB_GENMARSHAL@ ;;							\

Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/pango/Makefile.am,v
retrieving revision 1.58
diff -u -r1.58 Makefile.am
--- Makefile.am	2001/10/10 19:42:30	1.58
+++ Makefile.am	2001/10/16 13:56:23
@@ -199,7 +199,7 @@
 	&& rm -f tmp-pango-enum-types.h	\
 	&& echo timestamp > $(@F)
 
-pango-enum-types.c: s-enum-types-c
+pango-enum-types.c: pango-enum-types.h s-enum-types-c
 	@true
 
 s-enum-types-c: @REBUILD@ $(pango_headers) Makefile