sim: move sim-engine.o/sim-hrw.o to the common list

[thirdparty/binutils-gdb.git] / sim / d10v / Makefile.in

diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index d965b7f4b277033f7a1ffe6c7210afd3ce458ecd..167e76bd8bf1514c79f23304e869483ee646e303 100644 (file)
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -1,8 +1,7 @@
 #    Makefile template for Configure for the D10v sim library.
-#    Copyright (C) 1996, 1997, 2007, 2008, 2009, 2010, 2011
-#    Free Software Foundation, Inc.
+#    Copyright (C) 1996-2015 Free Software Foundation, Inc.
 #    Written by Cygnus Support.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -18,9 +17,15 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
-SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
+SIM_OBJS = \
+       interp.o \
+       $(SIM_NEW_COMMON_OBJS) \
+       sim-cpu.o \
+       sim-hload.o \
+       table.o \
+       simops.o \
+       endian.o
 SIM_EXTRA_CLEAN = clean-extra
-SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT
 
 INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
        $(srcroot)/include/gdb/sim-d10v.h
@@ -30,6 +35,8 @@ NL_TARGET = -DNL_TARGET_d10v
 
 ## COMMON_POST_CONFIG_FRAG
 
+simops.o: simops.h
+
 simops.h: gencode
        ./gencode -h >$@
 
@@ -37,18 +44,13 @@ table.c: gencode simops.h
        ./gencode >$@
 
 gencode.o: gencode.c $(INCLUDE)
-       $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gencode.c
+       $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/gencode.c
 
 d10v-opc.o: $(srcdir)/../../opcodes/d10v-opc.c
-       $(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c
+       $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(WARN_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c
 
 gencode: gencode.o d10v-opc.o
-       $(CC_FOR_BUILD) $(BUILD_CFLAGS) -o gencode gencode.o d10v-opc.o $(BUILD_LIB)
+       $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o gencode gencode.o d10v-opc.o $(BUILD_LIB)
 
 clean-extra:
        rm -f table.c simops.h gencode
-
-interp.o: interp.c table.c $(INCLUDE)
-simops.o: simops.c simops.h $(INCLUDE)
-endian.o: endian.c $(INCLUDE)
-table.o: table.c