From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8440 invoked by alias); 29 Jan 2002 15:35:03 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 8389 invoked from network); 29 Jan 2002 15:35:00 -0000 Received: from unknown (HELO nerodeguest) (66.24.57.101) by sources.redhat.com with SMTP; 29 Jan 2002 15:35:00 -0000 Received: from neroden (helo=localhost) by nerodeguest with local-esmtp (Exim 3.33 #1 (Debian)) id 16VaHo-0007mx-00 for ; Tue, 29 Jan 2002 10:35:04 -0500 Date: Tue, 29 Jan 2002 07:35:00 -0000 From: Nathanael Nerode X-Sender: neroden@nerodeguest To: gdb-patches@sources.redhat.com Subject: PATCH: autoconfiscate SPU (take two) In-Reply-To: <20020128222633.A21541@nevyn.them.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-SW-Source: 2002-01/txt/msg00755.txt.bz2 This patch autoconfiscates SPU. (Directory src/utils/spu) It's a pretty basic job, not actually working around any potentially missing headers, but it works (on i686-linux-gnu, debian woody) Corrected from previous version to work with autoconf 2.13. Because 'configure' is new, cvs diff refused to mention it. It's generated by autoconf 2.13 from configure.in and will need to be committed along with the patch. Because of this and the total changes to the other two files, the patch looks far worse than the three files; if anyone wants me to wrap those up somehow, I will. 2002-01-28 Nathanael Nerode Autoconfiscation of SPU. * utils/spu/configure: new file for autoconfiscation * utils/spu/configure.in: replaced for autoconfiscation * utils/spu/Makefile.in: replaced for autoconfiscation Index: Makefile.in =================================================================== RCS file: /cvs/src/src/utils/spu/Makefile.in,v retrieving revision 1.1.1.1 diff -r1.1.1.1 Makefile.in 1c1 < # Copyright 1993, 1994 Free Software Foundation, Inc. --- > # Copyright 1993, 1994, 2002 Free Software Foundation, Inc. 3c3 < # This file is part of GNU CC. --- > # This file is part of SPU. 17a18 > VPATH = @srcdir@ 19c20 < prefix = /usr/local --- > SHELL = /bin/sh 21,25c22,33 < program_transform_name = < exec_prefix = $(prefix) < bindir = $(exec_prefix)/bin < libdir = $(exec_prefix)/lib < tooldir = $(libdir)/$(target_alias) --- > prefix = @prefix@ > exec_prefix = @exec_prefix@ > bindir = @bindir@ > libdir = @libdir@ > datadir = @datadir@ > mandir = @mandir@ > infodir = @infodir@ > includedir = @includedir@ > srcdir = @srcdir@ > > CC = @CC@ > CFLAGS = @CFLAGS@ 27,28d34 < datadir = $(prefix)/share < mandir = $(prefix)/man 38,41c44 < infodir = $(prefix)/info < includedir = $(prefix)/include < < SHELL = /bin/sh --- > tooldir = $(libdir)/$(target_alias) 43c46 < INSTALL = install -c --- > INSTALL = @INSTALL@ 47,54d49 < AR = ar < AR_FLAGS = qv < RANLIB = ranlib < < # Directory containing source files. Don't clean up the spacing, < # this exact string is matched for by the "configure" script. < srcdir = . < 57,58c52 < INCLUDE_DIR = ${srcdir}/../../include < INCLUDE_DEP = $$(INCLUDE_DIR) --- > INCLUDE_DIR = ${srcdir}/../../include 67,71d60 < # CFLAGS is specifically reserved for setting from the command line < # when running make. I.E. "make CFLAGS=-Wmissing-prototypes". < < CFLAGS = -g < 74,96c63 < ALL_CFLAGS = $(CFLAGS) $(INCLUDE_CFLAGS) < < # None of the things in CFLAGS will do any harm, and on some systems < # (e.g. SunOS4) it is important to use the MH_CFLAGS. < < LDFLAGS = $(CFLAGS) < < # Where is the "-liberty" library, containing getopt and obstack? < < LIBIBERTY_DIR = ${srcdir}/../../libiberty < LIBIBERTY = ./../../libiberty${subdir}/libiberty.a < < # Host and target-dependent makefile fragments come in here. < #### < # End of host and target-dependent makefile fragments < < # Prevent Sun make from putting in the machine type. Setting < # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1. < < .c.o: < ${CC} -c ${ALL_CFLAGS} $< < < OFILES = spu.o --- > ALL_CFLAGS = @DEFS@ $(INCLUDE_CFLAGS) $(CFLAGS) 104,106c71 < install-info: < < spu: ${OFILES} --- > spu: spu.o 109c74,77 < spu.o: spu.c --- > # Prevent Sun make from putting in the machine type. Setting > # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1. > spu.o: $(srcdir)/spu.c > ${CC} -c ${ALL_CFLAGS} $(srcdir)/spu.c 113c81 < clean: mostlyclean --- > clean: mostlyclean 116,117c84,87 < distclean: clean < rm -f Makefile config.status --- > distclean: clean > rm -f Makefile config.status config.log config.cache > > maintainer-clean realclean: distclean 119c89,90 < maintainer-clean realclean: distclean --- > Makefile: $(srcdir)/Makefile.in config.status > ./config.status 121,122c92,93 < Makefile: Makefile.in $(host_makefile_frag) $(target_makefile_frag) < $(SHELL) config.status --- > config.status: $(srcdir)/configure > ./config.status --recheck 124c95,96 < force: --- > $(srcdir)/configure: $(srcdir)/configure.in > cd $(srcdir) && autoconf Index: configure.in =================================================================== RCS file: /cvs/src/src/utils/spu/configure.in,v retrieving revision 1.1.1.1 diff -r1.1.1.1 configure.in 1,4c1 < # This file is a shell script fragment that supplies the information < # necessary to tailor a template configure script into the configure < # script appropriate for this directory. For more information, check < # any existing configure script. --- > # Process this file with autoconf to produce a configure script. 6,7c3 < srctrigger=spu.c < srcname="spu" --- > # Copyright 2002 Free Software Foundation, Inc. 9c5 < # per-host: --- > # This file is part of SPU. 11c7,19 < # per-target: --- > # 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. 13c21,40 < # post-target: --- > AC_INIT([spu.c]) > > # Checks for programs. > AC_PROG_CC > AC_PROG_INSTALL > > # Checks for header files. > # The program doesn't actually handle failure. > #AC_HEADER_STDC > #AC_CHECK_HEADERS([stdlib.h string.h]) > > # Checks for typedefs, structures, and compiler characteristics. > AC_C_CONST > > # Checks for library functions. > # The program doesn't actually handle failure. > #AC_FUNC_MALLOC > #AC_CHECK_FUNCS([memset strtol]) > > AC_OUTPUT([Makefile])