diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 19a839885a8..038e82917be 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -2,6 +2,12 @@ Wed Nov 12 12:18:08 1997  Doug Evans  <devans@canuck.cygnus.com>
 
 	* aclocal.m4 (SIM_AC_OPTION_SCACHE): Fix typo.
 
+	* Make-common.in (BUILT_SRC_FROM_COMMON): Remove files no longer
+	built this way.
+	(sim-config.o): Remove non-existent $(sim-nconfig_h) dependency.
+	(clean): Don't delete $(BUILT_SRC_FROM_COMMON) if building in
+	source tree.
+
 Tue Nov 11 13:28:02 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* sim-events.c (sim_events_process): Re-compute the time -
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index b40cb8ef64f..f2a289faf3b 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -247,13 +247,7 @@ sim-break_h = $(srcdir)/../common/sim-break.h
 # necessary, the reason should be documented here.
 
 BUILT_SRC_FROM_COMMON= \
-	sim-endian.c \
-	sim-inline.c \
-	sim-bits.c \
-	sim-events.c \
-	sim-core.c \
-	sim-config.c \
-	sim-io.c
+	sim-inline.c
 
 sim-abort.o: $(srcdir)/../common/sim-abort.c \
 	$(SIM_EXTRA_DEPS)
@@ -263,7 +257,7 @@ sim-bits.o: $(srcdir)/../common/sim-bits.c $(sim-bits_h) $(sim-n-bits_h) \
 	$(SIM_EXTRA_DEPS)
 	$(CC) -c $(srcdir)/../common/sim-bits.c $(ALL_CFLAGS)
 
-sim-config.o: $(srcdir)/../common/sim-config.c $(sim-config_h) $(sim-nconfig_h) \
+sim-config.o: $(srcdir)/../common/sim-config.c $(sim-config_h) \
 	$(SIM_EXTRA_DEPS)
 	$(CC) -c $(srcdir)/../common/sim-config.c $(ALL_CFLAGS)
 
@@ -411,7 +405,9 @@ clean: $(SIM_EXTRA_CLEAN)
 	rm -f *.[oa] *~ core
 	rm -f run libsim.a
 	rm -f gentmap targ-map.c targ-vals.h
-	rm -f $(BUILT_SRC_FROM_COMMON)
+	if [ "cd $(srcdir) && pwd" != `pwd` ] ; then \
+		rm -f $(BUILT_SRC_FROM_COMMON) ; \
+	fi
 
 distclean mostlyclean maintainer-clean realclean: clean
 	rm -f TAGS