diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 6311d64dd1f2d856b760bc771d12f3019e918a88..9d225c13b8c726edc949e3f231873556264e80f9 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,4 +1,12 @@
+2005-10-29  Mike Stump  <mrs@apple.com>
+
+	* Makefile.am (kinds.h): Remove target, if command fails.
+	(selected_int_kind.inc): Likewise.
+	(selected_real_kind.inc): Likewise.
+	* Makefile.in: Regenerate.
+
 2005-10-28  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+	
 
 	* Makefile.am (intrinsics): Add signal.c.
 	* Makefile.in: Regenerate.
@@ -34,12 +42,12 @@
 	* io/transfer.c (init_loop_spec): New function to initialize
 	an array_loop_spec.
 	(next_array_record): New function to return the index to the next array
-	record by incrementing through the array_loop_spec. 
+	record by incrementing through the array_loop_spec.
 	(next_record_r): Use new function.
 	(next_record_w): Use new function.
 	(finalize_transfer): Free memory allocated for array_loop_spec.
 	* io/unit.c (get_array_unit_len): Delete this function. Use new
-	function init_loop_spec to initialize the array_loop_spec.  
+	function init_loop_spec to initialize the array_loop_spec.
 
 2005-10-24  Paul Thomas  <pault@gcc.gnu.org>
 
@@ -150,7 +158,7 @@
 
 	PR libgfortran/24313
 	*  c99_functions.c (csqrtf, csqrt): Fix choice of branch cut.  Note
-	csqrt{f} were imported from glibc, and this bug is still present 
+	csqrt{f} were imported from glibc, and this bug is still present
 	there. glibc PR is 1146.
 
 2005-10-07  Janne Blomqvist <jblomqvi@cc.hut.fi>
@@ -189,7 +197,7 @@
         * io/unix.c (mem_alloc_w_at): Remove call to generate_error end-of-file.
         * io/write.c (write_float): Add checks for NULL pointer returns from
         write_block calls. (write_integer): Same.
-        
+
 2005-10-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* runtime/memory.c (allocate_size): Malloc 1 byte if size == 0.
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index b47b768a20ae428f0d1bfdcfa9498bb1ff80c872..696ac3fb246ba08c836477054a8241b5f62a0393 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -578,7 +578,7 @@ I_M4_DEPS0=$(I_M4_DEPS) m4/iforeach.m4
 I_M4_DEPS1=$(I_M4_DEPS) m4/ifunction.m4
 
 kinds.h: $(srcdir)/mk-kinds-h.sh
-	$(SHELL) $(srcdir)/mk-kinds-h.sh '$(FCCOMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-kinds-h.sh '$(FCCOMPILE)' > $@ || rm $@
 
 kinds.inc: kinds.h
 	grep '^#' < kinds.h > $@
@@ -587,10 +587,10 @@ c99_protos.inc: $(srcdir)/c99_protos.h
 	grep '^#' < $(srcdir)/c99_protos.h > $@
 
 selected_int_kind.inc: $(srcdir)/mk-sik-inc.sh
-	$(SHELL) $(srcdir)/mk-sik-inc.sh '$(FCCOMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-sik-inc.sh '$(FCCOMPILE)' > $@ || rm $@
 
 selected_real_kind.inc: $(srcdir)/mk-srk-inc.sh
-	$(SHELL) $(srcdir)/mk-srk-inc.sh '$(FCCOMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-srk-inc.sh '$(FCCOMPILE)' > $@ || rm $@
 
 fpu-target.h: $(srcdir)/$(FPU_HOST_HEADER)
 	cp $(srcdir)/$(FPU_HOST_HEADER) $@
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 256fe1d38fd10ac2647d160e2c186d19315175bc..d52a54a32e577758deb41e6763df8f1979d196c6 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -2694,7 +2694,7 @@ uninstall-am: uninstall-info-am uninstall-toolexeclibLTLIBRARIES
 
 
 kinds.h: $(srcdir)/mk-kinds-h.sh
-	$(SHELL) $(srcdir)/mk-kinds-h.sh '$(FCCOMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-kinds-h.sh '$(FCCOMPILE)' > $@ || rm $@
 
 kinds.inc: kinds.h
 	grep '^#' < kinds.h > $@
@@ -2703,10 +2703,10 @@ c99_protos.inc: $(srcdir)/c99_protos.h
 	grep '^#' < $(srcdir)/c99_protos.h > $@
 
 selected_int_kind.inc: $(srcdir)/mk-sik-inc.sh
-	$(SHELL) $(srcdir)/mk-sik-inc.sh '$(FCCOMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-sik-inc.sh '$(FCCOMPILE)' > $@ || rm $@
 
 selected_real_kind.inc: $(srcdir)/mk-srk-inc.sh
-	$(SHELL) $(srcdir)/mk-srk-inc.sh '$(FCCOMPILE)' > $@
+	$(SHELL) $(srcdir)/mk-srk-inc.sh '$(FCCOMPILE)' > $@ || rm $@
 
 fpu-target.h: $(srcdir)/$(FPU_HOST_HEADER)
 	cp $(srcdir)/$(FPU_HOST_HEADER) $@