From 06383557e06f05d4421d0ff8ac63a42c0f36e55a Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Sat, 19 Feb 2000 15:46:40 +0000
Subject: [PATCH] Patch rtems-rc-4.5.0-diff from Ralf Corsepius to address a
 problem where user Makefiles where accidentally used when using the RTEMS
 application Makefile scheme.

---
 aclocal/prog-cxx.m4    | 2 ++
 c/src/make/Makefile.am | 2 ++
 c/src/make/main.cfg.in | 7 +------
 make/main.cfg          | 7 +------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/aclocal/prog-cxx.m4 b/aclocal/prog-cxx.m4
index e3f1246f15..aa8716df7e 100644
--- a/aclocal/prog-cxx.m4
+++ b/aclocal/prog-cxx.m4
@@ -64,6 +64,8 @@ unset ac_cv_prog_gxx
 unset ac_cv_prog_cc_g
 unset ac_cv_prog_cxx_works
 unset ac_cv_prog_cxx_cross
+dnl somehow autoconf macros leave this file 
+rm -f conftest.C
 ])
 
 AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
diff --git a/c/src/make/Makefile.am b/c/src/make/Makefile.am
index 01bac334d9..e86b688293 100644
--- a/c/src/make/Makefile.am
+++ b/c/src/make/Makefile.am
@@ -48,5 +48,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 	@echo rtems_cv_RTEMS_CPU_MODEL=\$${rtems_cv_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@
 	@echo rtems_cv_RTEMS_BSP_FAMILY=\$${rtems_cv_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@
 
+DISTCLEANFILES = @RTEMS_BSP@.cache
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/make/main.cfg.in b/c/src/make/main.cfg.in
index 3e1c8fc50e..7eb3b81b0c 100644
--- a/c/src/make/main.cfg.in
+++ b/c/src/make/main.cfg.in
@@ -61,14 +61,9 @@ $(TARGET_VARIANTS)
 ${ARCH}:
 	test -d ${ARCH} || mkdir ${ARCH}
 
-# general purpose forcing dependency; try to use .PHONY instead
-FORCEIT:
-
-FORCE:
-
 ifndef AUTOMAKE
 distclean-generic:
-	-$(RM) Makefile .#* $(CONFIG_CLEAN_FILES)
+	-$(RM) .#* $(CONFIG_CLEAN_FILES)
 	-$(RM) -r $(CLOBBER_ADDITIONS)
 
 clean-generic:
diff --git a/make/main.cfg b/make/main.cfg
index 1a050d34ab..495b7c74b8 100644
--- a/make/main.cfg
+++ b/make/main.cfg
@@ -61,14 +61,9 @@ $(TARGET_VARIANTS)
 ${ARCH}:
 	test -d ${ARCH} || mkdir ${ARCH}
 
-# general purpose forcing dependency; try to use .PHONY instead
-FORCEIT:
-
-FORCE:
-
 ifndef AUTOMAKE
 distclean-generic:
-	-$(RM) Makefile .#* $(CONFIG_CLEAN_FILES)
+	-$(RM) .#* $(CONFIG_CLEAN_FILES)
 	-$(RM) -r $(CLOBBER_ADDITIONS)
 
 clean-generic: