sim: drop configure scripts for simple ports

[thirdparty/binutils-gdb.git] / sim / common / Make-common.in

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 41becaa05f161596fe7d4c52bf3af821d655e539..4bf1e2e21e273a4325dc06a9e3f44d98396fae61 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -34,12 +34,15 @@
 
 ## COMMON_PRE_CONFIG_FRAG
 
-VPATH = @srcdir@:$(srccom)
 srcdir = @srcdir@
+VPATH = $(srcdir):$(srccom)
 srccom = $(srcdir)/../common
 srcroot = $(srcdir)/../..
 srcsim = $(srcdir)/..
 
+@SIM_COMMON_BUILD_FALSE@config.status = config.status
+@SIM_COMMON_BUILD_TRUE@config.status = ../config.status
+
 include $(srcroot)/gdb/silent-rules.mk
 
 # Helper code from gnulib.
@@ -413,7 +416,7 @@ endif
 
 # FIXME This is one very simple-minded way of generating the file hw-config.h
 hw-config.h: stamp-hw ; @true
-stamp-hw: Makefile.in $(srccom)/Make-common.in config.status Makefile
+stamp-hw: Makefile.in $(srccom)/Make-common.in $(config.status) Makefile
        rm -f tmp-hw.h
        echo "/* generated by Makefile */" > tmp-hw.h
        sim_hw="$(SIM_HW_DEVICES)"; \
@@ -529,14 +532,15 @@ distclean maintainer-clean realclean: clean $(SIM_EXTRA_DISTCLEAN)
 # Dummy target to force execution of dependent targets.
 force:
 
-Makefile: Makefile.in $(srccom)/Make-common.in config.status
-       CONFIG_HEADERS= $(SHELL) ./config.status
+Makefile: Makefile.in $(srccom)/Make-common.in $(config.status)
+@SIM_COMMON_BUILD_FALSE@       CONFIG_HEADERS= $(SHELL) ./config.status
+@SIM_COMMON_BUILD_TRUE@        cd .. && $(SHELL) ./config.status $(arch)/Makefile
 
-config.status: configure
-       $(SHELL) ./config.status --recheck
+@SIM_COMMON_BUILD_FALSE@config.status: configure
+@SIM_COMMON_BUILD_FALSE@       $(SHELL) ./config.status --recheck
 
 .gdbinit: # config.status $(srccom)/gdbinit.in
-       CONFIG_FILES=$@:../common/gdbinit.in CONFIG_HEADERS= $(SHELL) ./config.status
+@SIM_COMMON_BUILD_FALSE@       CONFIG_FILES=$@:../common/gdbinit.in CONFIG_HEADERS= $(SHELL) ./config.status
 
 
 # CGEN support