Host-level GNUmakefiles.

1 files changed, 38 insertions, 25 deletions

diff --git a/gdb/configure b/gdb/configure
index 03ad63e..b4a8dc2 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -177,7 +177,6 @@ fi
 #### configure.in common parts come in here.
 srcname="GDB"
 srctrigger=main.c
-Makefile=Makefile.conf
 
 ## end of common part.
 
@@ -336,13 +335,17 @@ host_makefile_frag=xconfig/${host}
 target_makefile_frag=tconfig/${target}
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) is not set in the
-# ?config/* file, we don't make the corresponding links.
+# ?config/* file, we don't make the corresponding links.  But we have
+# to remove the xm.h files and tm.h files anyway, e.g. when switching
+# from "configure host" to "configure none".
 files=
 links=
+rm -f xm.h
 if [ "${hostfile}" != "" ]; then
 	files="${files} ${hostfile}"
 	links="${links} xm.h"
 fi
+rm -f tm.h
 if [ "${targetfile}" != "" ]; then
 	files="${files} ${targetfile}"
 	links="${links} tm.h"
@@ -540,11 +543,7 @@ case ${srcdir} in
       echo "source ${srcdir}/.gdbinit" >> .gdbinit
 esac
 
-rm -f Makefile
-if [ ! -f ${srcdir}/depend ]; then
-  make -f Makefile.conf make-depend
-fi
-make -f Makefile.conf make-Makefile
+cat ${srcdir}/alldeps.mak ${srcdir}/depend >>Makefile
 ## end of post-target part.
 
 			if [ "${host}" = "${target}" ] ; then
@@ -562,19 +561,21 @@ make -f Makefile.conf make-Makefile
 		fi
 	done # for each target
 
-#	# Now build a Makefile for this host.
-#	if [ -n "${forcesubdirs}" ] ; then
-#		cd ${hostsubdir}
-#		cat > GNUmakefile << E!O!F
-## Makefile generated by configure for host ${host}.
-#
-#%:
-#	for i in ${targets} ; do \
-#		$(MAKE) -C Target-\$i \$@
-#
-#all clean stage1 stage2 stage3 stage4etags tags TAGS
-#E!O!F
-#	fi
+	# Now build a Makefile for this host.
+	if [ -n "${forcesubdirs}" -a ! -n "${removing}" ] ; then
+		cd ${hostsubdir}
+		cat > GNUmakefile << E!O!F
+# Makefile generated by configure for host ${host}.
+
+ALL := $(shell ls -d Target-*)
+
+%:
+	$(foreach subdir,$(ALL),$(MAKE) -C $(subdir) \$@ &&) true
+
+all:
+E!O!F
+		cd ..
+	fi
 done # for each host
 
 # If there are subdirectories, then recurse. 
@@ -601,7 +602,7 @@ for configdir in ${configdirs} ; do
 		if [ -n "${commons}" ] ; then
 			if [ -d ${configdir} ] ; then
 				(cd ${configdir} ;
-					./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
+					./configure ${commons} ${verbose} ${forcesubdirs} ${removing} +destdir=${destdir}) \
 					| sed 's/^/	/'
 			else
 				echo Warning: directory \"${configdir}\" is missing.
@@ -612,7 +613,7 @@ for configdir in ${configdirs} ; do
 			for host in ${specifics} ; do
 				echo Configuring target specific directory ${configdir}.${host}...
 				(cd ${configdir}.${host} ;
-					./configure ${host} ${verbose} ${forcesubdirs} ${removing}) \
+					./configure ${host} ${verbose} ${forcesubdirs} ${removing} +destdir=${destdir}) \
 					| sed 's/^/	/'
 			done # for host in specifics
 		fi # if there are any specifics
@@ -637,7 +638,8 @@ for configdir in ${configdirs} ; do
 		if [ -n "${commons}" ] ; then
 			if [ -d ${configdir} ] ; then
 				(cd ${configdir} ;
-					./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
+					./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} \
+						${commons} +destdir=${destdir}) \
 					| sed 's/^/	/'
 			else
 				echo Warning: directory \"${configdir}\" is missing.
@@ -648,7 +650,8 @@ for configdir in ${configdirs} ; do
 			for target in ${specifics} ; do
 				echo Configuring target specific directory ${configdir}.${target}...
 				(cd ${configdir}.${target} ;
-					./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} "+target=${target}") \
+					./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} \
+						"+target=${target}" +destdir=${destdir}) \
 					| sed 's/^/	/'
 			done
 		fi # if any specifics
@@ -659,7 +662,17 @@ exit 0
 
 #
 # $Log$
-# Revision 1.9  1991/07/06 04:35:51  gnu
+# Revision 1.12  1991/08/06 19:12:51  rich
+# Host-level GNUmakefiles.
+#
+# Revision 1.22  1991/07/20  01:22:30  rich
+# propogate gdb changes and destdir fix
+#
+# Revision 1.21  1991/07/20  00:55:20  gnu
+# Roll in new configure that handles GDB.  Make sure that the "configure"
+# that is checked-in reflects the latest "configure.in", which includes gdb.
+#
+# Revision 1.9  1991/07/06  04:35:51  gnu
 # Fix bug in configure when iterating targets.
 # Depend on alldeps.mak, not ${srcdir}/alldeps.mak, so it can be found
 # in either spot.