From 580817ec0132265e6dfd0bb19b5deaf6b5866a35 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 29 Jan 2022 00:10:59 -0500 Subject: [PATCH] libgloss: update Makefile regen rules for merged arches For arches that had their configure merged into the top-level, make sure they don't still depend on a subdir configure script that no longer exists. I had cleaned this up for some of the subdirs, but these got lost in the shuffle. --- libgloss/iq2000/Makefile.in | 7 ++----- libgloss/microblaze/Makefile.in | 7 ++----- libgloss/nios2/Makefile.in | 7 ++----- libgloss/pa/Makefile.in | 7 ++----- libgloss/sparc_leon/Makefile.in | 7 ++----- libgloss/visium/Makefile.in | 7 ++----- 6 files changed, 12 insertions(+), 30 deletions(-) diff --git a/libgloss/iq2000/Makefile.in b/libgloss/iq2000/Makefile.in index 21cc2869f..52b38a3e9 100644 --- a/libgloss/iq2000/Makefile.in +++ b/libgloss/iq2000/Makefile.in @@ -142,8 +142,5 @@ ${CRT0}: ${srcdir}/crt0.S # target specific makefile fragment comes in here. @target_makefile_frag@ -Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@ - $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck +Makefile: Makefile.in ../config.status + cd .. && $(SHELL) config.status diff --git a/libgloss/microblaze/Makefile.in b/libgloss/microblaze/Makefile.in index fe04a08c9..670c16a46 100644 --- a/libgloss/microblaze/Makefile.in +++ b/libgloss/microblaze/Makefile.in @@ -141,8 +141,5 @@ info doc dvi: install-info: clean-info: -Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@ \ - $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck +Makefile: Makefile.in ../config.status + cd .. && $(SHELL) config.status diff --git a/libgloss/nios2/Makefile.in b/libgloss/nios2/Makefile.in index fd7e79f70..fe1ea6ada 100644 --- a/libgloss/nios2/Makefile.in +++ b/libgloss/nios2/Makefile.in @@ -111,8 +111,5 @@ info dvi doc: install-info: clean-info: -Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@ - $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck +Makefile: Makefile.in ../config.status + cd .. && $(SHELL) config.status diff --git a/libgloss/pa/Makefile.in b/libgloss/pa/Makefile.in index 03323c3b8..a26b332a6 100644 --- a/libgloss/pa/Makefile.in +++ b/libgloss/pa/Makefile.in @@ -149,8 +149,5 @@ op50nled.o: ${srcdir}/op50nled.c # target specific makefile fragment comes in here. @target_makefile_frag@ -Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@ - $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck +Makefile: Makefile.in ../config.status + cd .. && $(SHELL) config.status diff --git a/libgloss/sparc_leon/Makefile.in b/libgloss/sparc_leon/Makefile.in index 5cc1e5491..d914009f1 100644 --- a/libgloss/sparc_leon/Makefile.in +++ b/libgloss/sparc_leon/Makefile.in @@ -157,8 +157,5 @@ clean-info: # target specific makefile fragment comes in here. @target_makefile_frag@ -Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@ - $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck +Makefile: Makefile.in ../config.status + cd .. && $(SHELL) config.status diff --git a/libgloss/visium/Makefile.in b/libgloss/visium/Makefile.in index bd430b286..2906977c5 100644 --- a/libgloss/visium/Makefile.in +++ b/libgloss/visium/Makefile.in @@ -122,8 +122,5 @@ clean-info: # target specific makefile fragment comes in here. @target_makefile_frag@ -Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@ - $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck +Makefile: Makefile.in ../config.status + cd .. && $(SHELL) config.status