Index: libguile/Makefile.am
===================================================================
RCS file: /cvs/guile/guile-core/libguile/Makefile.am,v
retrieving revision 1.118
diff -u -r1.118 Makefile.am
--- libguile/Makefile.am	2000/10/25 14:49:00	1.118
+++ libguile/Makefile.am	2000/11/15 19:26:43
@@ -99,8 +99,9 @@
 
 ## In next release, threads will be factored out of libguile.
 ## Until then, the machine specific headers is a temporary kludge.
-OMIT_DEPENDENCIES = libguile.h ltdl.h \
-    axp.h hppa.h i386.h ksr.h m88k.h mips.h sparc.h vax.h
+# disabled for CVS Automake
+# OMIT_DEPENDENCIES = libguile.h ltdl.h \
+#     axp.h hppa.h i386.h ksr.h m88k.h mips.h sparc.h vax.h
 
 ## This is kind of nasty... there are ".c" files that we don't want to
 ## compile, since they are #included in threads.c.  So instead we list
@@ -142,6 +143,9 @@
 EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads cpp_signal.c	\
     cpp_errno.c cpp_err_symbols.in cpp_sig_symbols.in cpp_cnvt.awk
 
+# CVS Automake dependency tracking with built source files need this line
+Makefile: $(BUILT_SOURCES)
+
 ## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
 libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	@echo "Generating libpath.h..." 
@@ -186,7 +190,7 @@
 	|| { rm $@; false; }
 .x.doc: 
 	PATH=.:${PATH} ./guile-doc-snarf $(srcdir)/$*.c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(srcdir)/$*.c > /dev/null \
-        || { rm $@; false; }
+	|| { rm $@; false; }
 
 error.x: cpp_err_symbols.c
 posix.x: cpp_sig_symbols.c
@@ -251,3 +255,4 @@
 	cpp_sig_symbols_here cpp_sig_symbols_diff cpp_sig_symbols_new
 
 CLEANFILES = libpath.h *.x *.doc
+
Index: qt/Makefile.am
===================================================================
RCS file: /cvs/guile/guile-core/qt/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- qt/Makefile.am	2000/06/12 21:28:19	1.11
+++ qt/Makefile.am	2000/11/15 19:26:44
@@ -36,7 +36,8 @@
 libqthreads_la_DEPENDENCIES = qtmds.lo qtmdc.lo
 libqthreads_la_LDFLAGS = -rpath $(libdir)
 
-OMIT_DEPENDENCIES = axp.h hppa.h i386.h ksr.h m88k.h mips.h sparc.h vax.h
+# disabled for CVS Automake
+# OMIT_DEPENDENCIES = axp.h hppa.h i386.h ksr.h m88k.h mips.h sparc.h vax.h
 
 .s.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) $(qthread_asflags) -c $<