From: John Gilmore <gnu@cygnus>
Date: Thu, 4 Jul 1991 15:59:47 +0000 (+0000)
Subject: Make gdb work with configure.  Only thing that doesn't work is the -list
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bdf3621b9e6618e13efd3bedd3be56d32c296075;p=binutils-gdb.git

Make gdb work with configure.  Only thing that doesn't work is the -list
option (as far as I know).
---

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 5eac62093df..cc0168c4eac 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -32,8 +32,7 @@ COPYING
 ChangeLog
 ChangeLog-3.x
 Convex.notes
-Makefile.dist
-Makefile.sdir
+Makefile.in
 Projects
 README
 TODO
@@ -56,7 +55,6 @@ breakpoint.h
 coffread.c
 command.c
 command.h
-config.gdb
 configure
 configure.in
 convex-pinsn.c
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 29dd5ff0914..9e5be7b889f 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2,19 +2,22 @@
 
 # This file is part of GDB.
 
-# GDB is free software; you can redistribute it and/or modify
+# 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 1, or (at your option)
-# any later version.
-
-# GDB is distributed in the hope that it will be useful,
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+# 
 # You should have received a copy of the GNU General Public License
-# along with GDB; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# Host and target-dependent makefile fragments come in here.
+####
 
 # Destination directory of the software tree build
 destdir = /usr/local
@@ -36,7 +39,9 @@ bindir=$(destdir)/bin
 #CC=gcc -traditional
 GCC=gcc
 
-VPATH=$(srcdir)
+# Directory containing source files.  Don't clean up the spacing,
+# this exact string is matched for by the "configure" script.
+srcdir = .
 
 # It is also possible that you will need to add -I/usr/include/sys to the
 # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which 
@@ -241,8 +246,8 @@ TESTS = testbpt.c testfun.c testrec.c testreg.c testregs.c
 # tdesc-lib cannot be named simply tdesc, because if it were, GNU make
 # would try to make it from tdesc.c.
 # tdesc-lib removed from the list due to Motorola copyrights...gnu@cygnus.com
-OTHERS = Makefile Makefile.dist depend alldeps.mak Makefile.sdir \
-	 createtags munch config.gdb config.status \
+OTHERS = Makefile Makefile.in depend alldeps.mak Makefile.conf \
+	 createtags munch configure configure.in config.status \
 	 ChangeLog ChangeLog-3.x \
 	 README TODO TAGS WHATS.NEW Projects \
 	 .gdbinit COPYING expread.tab.c \
@@ -334,15 +339,14 @@ rapp: $(RAPP_OBS)
 	${CC-LD} $(LDFLAGS) -o $@ rapp_init.c $(RAPP_OBS)
 	
 # Support for building Makefile out of configured pieces, automatically
-# generated dependencies, etc.
-Makefiles= Makefile.sdir $(M_MAKEFILE) \
-	${srcdir}/alldeps.mak ${srcdir}/Makefile.dist
-
-MAKE_MAKEFILE= echo "M_MAKEFILE=$(M_MAKEFILE)" | \
-	cat - ${Makefiles} ${srcdir}/depend > Makefile
+# generated dependencies, etc.  Makefile.conf is built by configure,
+# and includes the body of Makefile.in as well as configuration
+# settings.  We add alldeps.mak and depend to get Makefile.
+Makefiles= Makefile.conf ${srcdir}/alldeps.mak
 
 Makefile: $(Makefiles)
-	$(MAKE_MAKEFILE)
+	  cat ${Makefiles} depend > Makefile
+	
 
 alldeps.mak: ${srcdir}/tconfig ${srcdir}/xconfig
 	rm -f alldeps.mak alldeps.tmp allparam.tmp allconfig.tmp
@@ -395,7 +399,7 @@ alldeps.mak: ${srcdir}/tconfig ${srcdir}/xconfig
 # The sed script makes everything which depends on {x,t}m.h depend on
 # config.status as well, in case someone reconfigures gdb out from
 # under an already compiled gdb.
-depend: $(SOURCES) Makefile.dist
+depend: $(SOURCES) Makefile.in
 	@echo Ignore errors about non-existent system-supplied include files
 	@echo for systems other than the one you are using.
 	@echo "If xm.h and tm.h don't exist, the error messages saying so"
@@ -444,7 +448,7 @@ TAGS: ${TAGFILES}
 	$(srcdir)/createtags $(TM_FILE) ${XM_FILE} $(DEPFILES) ${TAGFILES}
 tags: TAGS
 
-# FIXME: Get alldeps.mak up to date, config.gdb none, THEN make gdb.tar.Z!
+# FIXME: Get alldeps.mak up to date, ./configure none, THEN make gdb.tar.Z!
 gdb.tar.Z: ${TARFILES} ${TARDIRS}
 	rm -f gdb.tar; rm -rf $(DIST)
 	mkdir $(DIST)
@@ -506,7 +510,7 @@ gdb.dvi : gdb-all.texinfo rdl-apps.texinfo
 copying.c : COPYING copying.awk
 	awk -f copying.awk < COPYING > copying.c
 
-version.c : Makefile.dist
+version.c : Makefile.in
 	echo 'char *version = "$(VERSION)";' >version.c
 
 ${srcdir}/expread.tab.c : $(srcdir)/expread.y
diff --git a/gdb/configure b/gdb/configure
index 44ab9dc268b..cd45e9c7f0a 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -10,19 +10,19 @@ configdirs=
 
 #This file is part of GNU.
 
-#GNU CC 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 1, or (at your option)
-#any later version.
-
-#GNU CC is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with GNU CC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# 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 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 # $Id$
 
@@ -52,6 +52,8 @@ defaulttargets=
 destdir=
 fatal=
 hostsubdir=
+Makefile=Makefile
+Makefile_in=Makefile.in
 norecurse=
 removing=
 srcdir=
@@ -175,10 +177,7 @@ fi
 #### configure.in common parts come in here.
 srcname="GDB"
 srctrigger=main.c
-
-if [ -z "${template}" ] ; then
-	make -f Makefile.dist Makefile.in
-fi
+Makefile=Makefile.conf
 
 ## end of common part.
 
@@ -199,6 +198,9 @@ if [ -n "${template}" ] ; then
 	-e '/^#### configure.in per-target parts come in here.$/,/^## end of per-target part.$/c\
 #### configure.in per-target parts come in here.\
 ## end of per-target part.' \
+	-e '/^#### configure.in post-target parts come in here.$/,/^## end of post-target part.$/c\
+#### configure.in post-target parts come in here.\
+## end of post-target part.' \
 	< ${template} > template.new
 
 	if [ -r configure.in ] ; then
@@ -212,18 +214,26 @@ if [ -n "${template}" ] ; then
 			exit 1
 		fi
 
-		# split configure.in into common, per-host, and per-target parts
+		# split configure.in into common, per-host, per-target,
+		# and post-target parts.  Post-target is optional.
 		sed -e '/^# per\-host:/,$d' configure.in > configure.com
 		sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' configure.in > configure.hst
-		sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
+		if grep -s '^# post-target:' configure.in ; then
+		  sed -e '1,/^# per\-target:/d' -e '/^# post\-target:/,$d' configure.in > configure.tgt
+		  sed -e '1,/^# post\-target:/d' configure.in > configure.pos
+		else
+		  sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
+		  echo >configure.pos
+		fi
 
 		# and insert them
 		sed -e '/^#### configure.in common parts come in here.$/  r configure.com' \
 			-e '/^#### configure.in per\-host parts come in here.$/  r configure.hst' \
 			-e '/^#### configure.in per\-target parts come in here.$/  r configure.tgt' \
+			-e '/^#### configure.in post\-target parts come in here.$/  r configure.pos' \
 			template.new > configure.new
 
-		rm -f configure.com configure.tgt configure.hst
+		rm -f configure.com configure.tgt configure.hst configure.pos
 	else
 		echo Warning: no configure.in in `pwd`
 		cat ${template} >> configure
@@ -284,11 +294,8 @@ if [ ! -f xconfig/${host} ]; then
 	exit 1
 fi
 
-targetfile=`awk '
-  $1 == "XM_FILE=" { print $2 }' <xconfig/$host`
-if [ "${targetfile}" = "/" ] ; then
-	targetfile=/dev/null
-fi
+#  We really shouldn't depend on there being a space after XM_FILE= ...
+hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <xconfig/$host`
 
 ## end of per-host part.
 
@@ -296,7 +303,7 @@ fi
 	for target in ${targets} ; do
 
 		if [ -n "${verbose}" ] ; then
-			echo "	"target=\"${target}\"
+			echo "	target=\"${target}\""
 		fi
 
 #### configure.in per-target parts come in here.
@@ -311,24 +318,24 @@ if [ -z "${removing}" ] ; then
 		print substr($0,6)}'
 fi
 
-hostfile=`awk '
-  $1 == "TM_FILE=" { print $2 }' <tconfig/$target`
-if [ "${hostfile}" = "/" ] ; then
-	hostfile=/dev/null
-fi
-
-if [ ! -d readline ]; then
-      mkdir readline
-      # This could be a symlink, but getting the name right (because
-      # srcdir can be either relative or absolute) would be hairy.
-      cp ${srcdir}/readline/Makefile readline
-fi
+#  We really shouldn't depend on there being a space after TM_FILE= ...
+targetfile=`awk '$1 == "TM_FILE=" { print $2 }' <tconfig/$target`
 
 host_makefile_frag=xconfig/${host}
 target_makefile_frag=tconfig/${target}
 
-files="${hostfile} ${targetfile}"
-links="xm.h tm.h"
+# If hostfile (XM_FILE) and/or targetfile (TM_FILE) is not set in the
+# ?config/* file, we don't make the corresponding links.
+files=
+links=
+if [ "${hostfile}" != "" ]; then
+	files="${files} ${hostfile}"
+	links="${links} xm.h"
+fi
+if [ "${targetfile}" != "" ]; then
+	files="${files} ${targetfile}"
+	links="${links} tm.h"
+fi
 
 ## end of per-target part.
 
@@ -348,13 +355,13 @@ links="xm.h tm.h"
 					echo Warning: no `pwd`/${hostsubdir} to remove.
 				fi
 			else
-				rm -f Makefile config.status ${links}
+				rm -f ${Makefile} config.status ${links}
 			fi
 		else
 			if [ -n "${forcesubdirs}" ] ; then
 				# check for existing status before allowing forced subdirs.
-				if [ -f Makefile ] ; then
-					echo "Makefile already exists in source directory.  `pwd` not configured."
+				if [ -f ${Makefile} ] ; then
+					echo "${Makefile} already exists in source directory.  `pwd` not configured."
 					exit 1
 				fi
 
@@ -443,27 +450,27 @@ links="xm.h tm.h"
 
 			# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
 			if [ "${host}" != "${target}" ] ; then
-				echo "CROSS=-DCROSS_COMPILE" > Makefile
-				echo "ALL=start.encap" >> Makefile
+				echo "CROSS=-DCROSS_COMPILE" > ${Makefile}
+				echo "ALL=start.encap" >> ${Makefile}
 			else
-				echo "ALL=all.internal" > Makefile
+				echo "ALL=all.internal" > ${Makefile}
 			fi
 
 			# set target, host, VPATH
-			echo "host = ${host}" >> Makefile
-			echo "target = ${target}" >> Makefile
+			echo "host = ${host}" >> ${Makefile}
+			echo "target = ${target}" >> ${Makefile}
 
 			if [ -n "${forcesubdirs}" ] ; then
-				echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile
+				echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}
 			else
-				echo "subdir =" >> Makefile
+				echo "subdir =" >> ${Makefile}
 			fi
 
-		#	echo "workdir = `pwd`" >> Makefile
-			echo "VPATH = ${srcdir}" >> Makefile
+		#	echo "workdir = `pwd`" >> ${Makefile}
+			echo "VPATH = ${srcdir}" >> ${Makefile}
 
-			# add Makefile.in
-			cat ${srcdir}/Makefile.in >> Makefile
+			# add "Makefile.in" (or whatever it's called)
+			cat ${srcdir}/${Makefile_in} >> ${Makefile}
 
 			# and shake thoroughly.
 			if [ -z "${host_makefile_frag}" ] ; then
@@ -476,37 +483,37 @@ links="xm.h tm.h"
 
 			# Conditionalize the makefile for this host.
 			if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-				sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
-				mv Makefile.tem Makefile
+				sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile} > Makefile.tem
+				mv Makefile.tem ${Makefile}
 			fi
 
 			# Conditionalize the makefile for this target.
 			if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-				sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
-				mv Makefile.tem Makefile
+				sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile} > Makefile.tem
+				mv Makefile.tem ${Makefile}
 			fi
 
 			# set srcdir
-			sed "s@^srcdir = \.@srcdir = ${srcdir}@" Makefile > Makefile.tem
-			mv Makefile.tem Makefile
+			sed "s@^srcdir = \.@srcdir = ${srcdir}@" ${Makefile} > Makefile.tem
+			mv Makefile.tem ${Makefile}
 
 			# set destdir
 			if [ -n "${destdir}" ] ; then
-				sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
-				mv Makefile.tem Makefile
+				sed "s:^destdir =.*$:destdir = ${destdir}:" ${Makefile} > Makefile.tem
+				mv Makefile.tem ${Makefile}
 			fi
 
 			# Remove all formfeeds, since some Makes get confused by them.
-			sed "s///" Makefile >> Makefile.tem
-			mv Makefile.tem Makefile
+			sed "s///" ${Makefile} >> Makefile.tem
+			mv Makefile.tem ${Makefile}
 
 			# reset SUBDIRS
-			sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" Makefile > Makefile.tem
-			mv Makefile.tem Makefile
+			sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" ${Makefile} > Makefile.tem
+			mv Makefile.tem ${Makefile}
 
 			# reset NONSUBDIRS
-			sed "s:^NONSUBDIRS =.*$:NONSUBDIRS = ${noconfigdirs}:" Makefile > Makefile.tem
-			mv Makefile.tem Makefile
+			sed "s:^NONSUBDIRS =.*$:NONSUBDIRS = ${noconfigdirs}:" ${Makefile} > Makefile.tem
+			mv Makefile.tem ${Makefile}
 
 			using=
 			if [ -f ${srcdir}/${host_makefile_frag} ] ; then
@@ -523,7 +530,24 @@ links="xm.h tm.h"
 				andusing=${using}
 			fi
 
-			echo "Created \"Makefile\"" in `pwd`${andusing}.
+			echo "Created \"${Makefile}\"" in `pwd`${andusing}.
+
+#### configure.in post-target parts come in here.
+
+case ${srcdir} in
+  .)
+    ;;
+  *)
+    grep -s "source ${srcdir}/.gdbinit" .gdbinit 2>/dev/null || \
+      echo "source ${srcdir}/.gdbinit" >> .gdbinit
+esac
+
+rm -f Makefile
+if [ ! -f depend ]; then
+  make -f Makefile.conf depend
+fi
+make -f Makefile.conf Makefile
+## end of post-target part.
 
 			if [ "${host}" = "${target}" ] ; then
 				echo "Links are now set up for use with a ${target}." \
@@ -637,7 +661,17 @@ exit 0
 
 #
 # $Log$
-# Revision 1.4  1991/05/19 00:16:45  rich
+# Revision 1.7  1991/07/04 15:59:46  gnu
+# Make gdb work with configure.  Only thing that doesn't work is the -list
+# option (as far as I know).
+#
+# Revision 1.6  1991/06/04  07:28:16  gnu
+# Change GDB over to GNU General Public License version 2.
+#
+# Revision 1.5  1991/05/19  07:26:54  rich
+# configure changes and -opcode.h movement.
+#
+# Revision 1.4  1991/05/19  00:16:45  rich
 # Configure for gdb.
 #
 # Revision 1.10  1991/05/04  00:58:38  rich
diff --git a/gdb/configure.in b/gdb/configure.in
index cd6844d1978..4e5957de849 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1,9 +1,6 @@
 srcname="GDB"
 srctrigger=main.c
-
-if [ -z "${template}" ] ; then
-	make -f Makefile.dist Makefile.in
-fi
+Makefile=Makefile.conf
 
 # per-host:
 
@@ -12,11 +9,8 @@ if [ ! -f xconfig/${host} ]; then
 	exit 1
 fi
 
-hostfile=`awk '
-  $1 == "XM_FILE=" { print $2 }' <xconfig/$host`
-if [ "${targetfile}" = "/" ] ; then
-	targetfile=/dev/null
-fi
+#  We really shouldn't depend on there being a space after XM_FILE= ...
+hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <xconfig/$host`
 
 # per-target:
 
@@ -30,22 +24,37 @@ if [ -z "${removing}" ] ; then
 		print substr($0,6)}'
 fi
 
-targetfile=`awk '
-  $1 == "TM_FILE=" { print $2 }' <tconfig/$target`
-if [ "${hostfile}" = "/" ] ; then
-	hostfile=/dev/null
-fi
-
-if [ ! -d readline ]; then
-      mkdir readline
-      # This could be a symlink, but getting the name right (because
-      # srcdir can be either relative or absolute) would be hairy.
-      cp ${srcdir}/readline/Makefile readline
-fi
+#  We really shouldn't depend on there being a space after TM_FILE= ...
+targetfile=`awk '$1 == "TM_FILE=" { print $2 }' <tconfig/$target`
 
 host_makefile_frag=xconfig/${host}
 target_makefile_frag=tconfig/${target}
 
-files="${hostfile} ${targetfile}"
-links="xm.h tm.h"
+# If hostfile (XM_FILE) and/or targetfile (TM_FILE) is not set in the
+# ?config/* file, we don't make the corresponding links.
+files=
+links=
+if [ "${hostfile}" != "" ]; then
+	files="${files} ${hostfile}"
+	links="${links} xm.h"
+fi
+if [ "${targetfile}" != "" ]; then
+	files="${files} ${targetfile}"
+	links="${links} tm.h"
+fi
+
+# post-target:
 
+case ${srcdir} in
+  .)
+    ;;
+  *)
+    grep -s "source ${srcdir}/.gdbinit" .gdbinit 2>/dev/null || \
+      echo "source ${srcdir}/.gdbinit" >> .gdbinit
+esac
+
+rm -f Makefile
+if [ ! -f depend ]; then
+  make -f Makefile.conf depend
+fi
+make -f Makefile.conf Makefile