* Make-common.in (clean targets): Undo patch of Apr. 22.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 37ebb46..e42de0a 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,12 @@
+Wed Apr 30 11:34:14 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+       * Make-common.in (clean targets): Undo patch of Apr. 22.
+
+Fri Apr 25 15:28:32 1997  Mike Meissner  <meissner@cygnus.com>
+
+       * sim-n-bits.h (signed): If we have a standard compiler, undef
+       signed, so that signedN is defined correctly.
+
 Thu Apr 24 00:00:07 1997  Doug Evans  <dje@canuck.cygnus.com>
 
        * sim-module.h, sim-model.h, sim-profile.h: New files.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index ad34813..1f3255a 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -69,6 +69,7 @@ SIM_BSWAP = @sim_bswap@
 SIM_CFLAGS = @sim_cflags@
 SIM_DEBUG = @sim_debug@
 SIM_TRACE = @sim_trace@
+SIM_PROFILE = @sim_profile@
 
 
 HDEFINES = @HDEFINES@
@@ -108,8 +109,8 @@ SIM_EXTRA_CLEAN =
 
 ## COMMON_POST_CONFIG_FRAG
 
-CONFIG_CFLAGS = @DEFS@ $(SIM_CFLAGS) $(SIM_DEBUG) $(SIM_TRACE) $(SIM_BSWAP) \
-  $(SIM_EXTRA_CFLAGS) $(HDEFINES) $(TDEFINES)
+CONFIG_CFLAGS = @DEFS@ $(SIM_CFLAGS) $(SIM_DEBUG) $(SIM_TRACE) $(SIM_PROFILE) \
+  $(SIM_BSWAP) $(SIM_EXTRA_CFLAGS) $(HDEFINES) $(TDEFINES)
 CSEARCH = -I. -I$(srcdir) -I../common -I$(srcdir)/../common \
   -I../../include -I$(srcroot)/include \
   -I../../bfd -I$(srcroot)/bfd \
@@ -176,7 +177,10 @@ sim_main_headers = \
        $(srcdir)/../common/sim-config.h \
        $(srcdir)/../common/sim-base.h \
        $(srcdir)/../common/sim-basics.h \
+       $(srcdir)/../common/sim-module.h \
+       $(srcdir)/../common/sim-model.h \
        $(srcdir)/../common/sim-trace.h \
+       $(srcdir)/../common/sim-profile.h \
        tconfig.h
 
 sim-assert_h = $(srcdir)/../common/sim-assert.h
@@ -257,6 +261,10 @@ sim-io.c: $(srcdir)/../common/sim-io.c
        cat $(srcdir)/../common/$@ >> tmp-$@
        $(srcdir)/../../move-if-change tmp-$@ $@
 
+sim-module.o: $(srcdir)/../common/sim-module.c $(sim_main_headers) \
+         $(srcdir)/../common/sim-io.h
+       $(CC) -c $(srcdir)/../common/sim-module.c $(ALL_CFLAGS)
+
 sim-options.o: $(srcdir)/../common/sim-options.c $(sim_main_headers) \
          $(srcdir)/../common/sim-options.h
        $(CC) -c $(srcdir)/../common/sim-options.c $(ALL_CFLAGS)
@@ -265,6 +273,10 @@ sim-trace.o: $(srcdir)/../common/sim-trace.c $(sim_main_headers) \
          $(srcdir)/../common/sim-io.h
        $(CC) -c $(srcdir)/../common/sim-trace.c $(ALL_CFLAGS)
 
+sim-profile.o: $(srcdir)/../common/sim-profile.c $(sim_main_headers) \
+         $(srcdir)/../common/sim-io.h
+       $(CC) -c $(srcdir)/../common/sim-profile.c $(ALL_CFLAGS)
+
 sim-utils.o: $(srcdir)/../common/sim-utils.c $(sim_main_headers) \
        $(SIM_EXTRA_DEPS)
        $(CC) -c $(srcdir)/../common/sim-utils.c $(ALL_CFLAGS)
@@ -299,13 +311,13 @@ tags etags: TAGS
 TAGS: force
        etags *.c *.h
 
-clean::
+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)
 
-distclean mostlyclean maintainer-clean realclean:: clean
+distclean mostlyclean maintainer-clean realclean: clean
        rm -f TAGS
        rm -f Makefile config.cache config.log config.status
        rm -f tconfig.h config.h stamp-h