From 63bbe9a2416f1c857999a2340c843b25a83deb38 Mon Sep 17 00:00:00 2001 From: "Dale S. Rahn" Date: Fri, 7 Aug 1998 01:58:02 +0000 Subject: Do not build the libiberty version of vasprintf, use the version that is in libc. This was done because the algorithm done in the libiberty version does not work with the powerpc stdarg/varargs processing. --- gnu/lib/libg++/libiberty/Makefile.in | 89 ++++++++++++++++++------------ gnu/usr.bin/binutils/libiberty/Makefile.in | 4 +- gnu/usr.bin/cvs/lib/Makefile.in | 41 +++++++------- 3 files changed, 78 insertions(+), 56 deletions(-) (limited to 'gnu') diff --git a/gnu/lib/libg++/libiberty/Makefile.in b/gnu/lib/libg++/libiberty/Makefile.in index 39c33eb78b6..74104cdcb43 100644 --- a/gnu/lib/libg++/libiberty/Makefile.in +++ b/gnu/lib/libg++/libiberty/Makefile.in @@ -1,6 +1,6 @@ # # Makefile -# Copyright (C) 1990, 1991, 1992, 1995 Free Software Foundation +# Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation # # This file is part of the libiberty library. # Libiberty is free software; you can redistribute it and/or @@ -14,8 +14,8 @@ # Library General Public License for more details. # # You should have received a copy of the GNU Library General Public -# License along with libiberty; see the file COPYING.LIB. If -# not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# License along with libiberty; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # @@ -34,7 +34,7 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib -datadir = $(prefix)/lib +datadir = $(prefix)/share mandir = $(prefix)/man man1dir = $(mandir)/man1 @@ -48,13 +48,12 @@ man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 infodir = $(prefix)/info includedir = $(prefix)/include -oldincludedir = -docdir = $(datadir)/doc SHELL = /bin/sh # Multilib support variables. -MULTITOP = . +MULTISRCTOP = +MULTIBUILDTOP = MULTIDIRS = MULTISUBDIR = MULTIDO = true @@ -107,14 +106,16 @@ FLAGS_TO_PASS = \ "LIBCFLAGS=$(LIBCFLAGS)" \ "EXTRA_OFILES=$(EXTRA_OFILES)" \ "HDEFINES=$(HDEFINES)" \ - "INCDIR=$(INCDIR)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ "LDFLAGS=$(LDFLAGS)" \ "LOADLIBES=$(LOADLIBES)" \ "PICFLAG=$(PICFLAG)" \ "RANLIB=$(RANLIB)" \ "SHELL=$(SHELL)" -all: stamp-picdir $(TARGETLIB) +all: stamp-picdir $(TARGETLIB) required-list @if [ "$(RULE1)" != "not-used" ]; then \ $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all; \ else true; \ @@ -127,11 +128,11 @@ check installcheck: #### Host, target, and site specific Makefile fragments come in here. ### -INCDIR=$(srcdir)/../include +INCDIR=$(srcdir)/$(MULTISRCTOP)../include COMPILE.c = $(CC) -c $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES) .c.o: - [ -z "$(PICFLAG)" ] || \ + test -z "$(PICFLAG)" || \ $(COMPILE.c) $(PICFLAG) $< -o pic/$@ $(COMPILE.c) $< @@ -145,22 +146,22 @@ HFILES = # NOTE: If you add new files to the library, add them to this list # (alphabetical), and add them to REQUIRED_OFILES or 'functions.def'. -CFILES = alloca.c argv.c basename.c bcmp.c bcopy.c bzero.c \ - clock.c concat.c cplus-dem.c fdmatch.c \ +CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c bzero.c \ + choose-temp.c clock.c concat.c cplus-dem.c fdmatch.c fnmatch.c \ getcwd.c getopt.c getopt1.c getpagesize.c getruntime.c \ floatformat.c hex.c index.c insque.c \ - memchr.c memcmp.c memcpy.c memmove.c memset.c \ - obstack.c random.c rename.c rindex.c sigsetmask.c spaces.c \ + memchr.c memcmp.c memcpy.c memmove.c memset.c objalloc.c \ + obstack.c pexecute.c random.c rename.c rindex.c sigsetmask.c spaces.c \ strcasecmp.c strncasecmp.c \ strchr.c strdup.c strerror.c strrchr.c strsignal.c \ strstr.c strtod.c strtol.c strtoul.c tmpnam.c \ - vasprintf.c vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c \ - xatexit.c xexit.c xmalloc.c xstrerror.c + vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c \ + xatexit.c xexit.c xmalloc.c xstrdup.c xstrerror.c # These are always included in the library. -REQUIRED_OFILES = argv.o basename.o concat.o cplus-dem.o fdmatch.o \ - getopt.o getopt1.o getruntime.o hex.o \ - floatformat.o obstack.o spaces.o strerror.o strsignal.o \ - vasprintf.o xatexit.o xexit.o xmalloc.o xstrerror.o +REQUIRED_OFILES = argv.o basename.o choose-temp.o concat.o cplus-dem.o \ + fdmatch.o fnmatch.o getopt.o getopt1.o getruntime.o hex.o \ + floatformat.o objalloc.o obstack.o pexecute.o spaces.o strerror.o \ + strsignal.o xatexit.o xexit.o xmalloc.o xstrdup.o xstrerror.o # Do we want/need any config overrides? # @@ -171,14 +172,15 @@ INSTALL_DEST = libdir install: install_to_$(INSTALL_DEST) install_to_libdir: all - $(INSTALL_DATA) $(TARGETLIB) $(libdir)/$(TARGETLIB).n - ( cd $(libdir) ; $(RANLIB) $(libdir)/$(TARGETLIB).n ) - mv -f $(libdir)/$(TARGETLIB).n $(libdir)/$(TARGETLIB) + $(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB).n + ( cd $(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB).n ) + mv -f $(libdir)$(MULTISUBDIR)/$(TARGETLIB).n $(libdir)$(MULTISUBDIR)/$(TARGETLIB) + @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install install_to_tooldir: all - $(INSTALL_DATA) $(TARGETLIB) $(tooldir)/lib/$(TARGETLIB).n - ( cd $(tooldir) ; $(RANLIB) $(tooldir)/lib/$(TARGETLIB).n ) - mv -f $(tooldir)/lib/$(TARGETLIB).n $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB) + $(INSTALL_DATA) $(TARGETLIB) $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB).n + ( cd $(tooldir)/lib$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB).n ) + mv -f $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB).n $(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB) @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install # The default configuration adds to libiberty all those functions that are @@ -186,8 +188,12 @@ install_to_tooldir: all # Then a sed+awk combination translates the ld error messages into # a list of .o files. -needed-list: stamp-picdir $(NEEDED_LIST) - cp $(NEEDED_LIST) needed-list +stamp-needed: stamp-picdir $(NEEDED_LIST) + cp $(NEEDED_LIST) needed-tmp + $(SHELL) $(srcdir)/$(MULTISRCTOP)../move-if-change needed-tmp needed-list + touch stamp-needed + +needed-list: stamp-needed ; @true lneeded-list: $(EXTRA_OFILES) needed.awk errors rm -f lneeded-list @@ -198,6 +204,9 @@ lneeded-list: $(EXTRA_OFILES) needed.awk errors *) f="$$f $$i" ;; \ esac ; \ done ; \ + case $$f in \ + *alloca.o*) f="$$f xmalloc.o xexit.o" ;; \ + esac ; \ echo $$f >>lneeded-list # Generate an awk script that looks for functions in functions.def @@ -209,8 +218,12 @@ needed.awk: $(srcdir)/functions.def Makefile | sed -e '/DEF/s|DEF.\([^,]*\).*|/\1/ { printf "\1.o " }|' \ >>needed.awk -config.h: $(CONFIG_H) - cp $(CONFIG_H) config.h +stamp-config: $(CONFIG_H) + cp $(CONFIG_H) config.tmp + $(SHELL) $(srcdir)/$(MULTISRCTOP)../move-if-change config.tmp config.h + touch stamp-config + +config.h: stamp-config ; @true lconfig.h: needed2.awk errors echo "/* !Automatically generated from $(srcdir)/functions.def"\ @@ -235,6 +248,10 @@ dummy.o: $(srcdir)/dummy.c $(srcdir)/functions.def errors: dummy.o $(EXTRA_OFILES) -($(ERRORS_CC) -o dummy $(CFLAGS) $(LDFLAGS) $(ERRORS_LDFLAGS) dummy.o $(EXTRA_OFILES) $(LOADLIBES)) >errors 2>&1 || true +# required-list is used when building a shared bfd/opcodes/libiberty library. +required-list: Makefile + echo $(REQUIRED_OFILES) > required-list + $(HOST_OFILES) $(REQUIRED_OFILES) : config.h RULE1 = $(TARGETLIB) @@ -279,15 +296,15 @@ ls: mostlyclean: rm -rf *.o pic core errs \#* *.E a.out - rm -f needed.awk needed2.awk errors dummy needed-list config.h + rm -f needed.awk needed2.awk errors dummy needed-list config.h stamp-* rm -f $(CONFIG_H) $(NEEDED_LIST) stamp-picdir @$(MULTICLEAN) multi-clean DO=mostlyclean clean: mostlyclean - rm -f *.a + rm -f *.a required-list tmpmulti.out @$(MULTICLEAN) multi-clean DO=clean distclean: clean - rm -f *~ Makefile config.status alloca-conf.h xhost-mkfrag TAGS @$(MULTICLEAN) multi-clean DO=distclean + rm -f *~ Makefile config.status alloca-conf.h xhost-mkfrag TAGS multilib.out maintainer-clean realclean: distclean force: @@ -300,16 +317,20 @@ basename.o: $(INCDIR)/libiberty.h concat.o: $(INCDIR)/libiberty.h cplus-dem.o: $(INCDIR)/demangle.h fdmatch.o: $(INCDIR)/libiberty.h +fnmatch.o: $(INCDIR)/fnmatch.h getopt.o: $(INCDIR)/getopt.h getopt1.o: $(INCDIR)/getopt.h getruntime.o: $(INCDIR)/libiberty.h hex.o: $(INCDIR)/libiberty.h floatformat.o: $(INCDIR)/floatformat.h +objalloc.o: $(INCDIR)/objalloc.h obstack.o: $(INCDIR)/obstack.h +pexecute.o: $(INCDIR)/libiberty.h spaces.o: $(INCDIR)/libiberty.h strerror.o: $(INCDIR)/libiberty.h strsignal.o: $(INCDIR)/libiberty.h xatexit.o: $(INCDIR)/libiberty.h xexit.o: $(INCDIR)/libiberty.h xmalloc.o: $(INCDIR)/libiberty.h +xstrdup.o: $(INCDIR)/libiberty.h xstrerror.o: $(INCDIR)/libiberty.h diff --git a/gnu/usr.bin/binutils/libiberty/Makefile.in b/gnu/usr.bin/binutils/libiberty/Makefile.in index e4d0dfff30e..bb73e94b91c 100644 --- a/gnu/usr.bin/binutils/libiberty/Makefile.in +++ b/gnu/usr.bin/binutils/libiberty/Makefile.in @@ -152,13 +152,13 @@ CFILES = alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c bzero.c \ strcasecmp.c strncasecmp.c \ strchr.c strdup.c strerror.c strrchr.c strsignal.c \ strstr.c strtod.c strtol.c strtoul.c tmpnam.c \ - vasprintf.c vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c \ + vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c \ xatexit.c xexit.c xmalloc.c xstrdup.c xstrerror.c # These are always included in the library. REQUIRED_OFILES = argv.o basename.o choose-temp.o concat.o cplus-dem.o \ fdmatch.o fnmatch.o getopt.o getopt1.o getruntime.o hex.o \ floatformat.o obstack.o spaces.o strerror.o strsignal.o \ - vasprintf.o xatexit.o xexit.o xmalloc.o xstrdup.o xstrerror.o + xatexit.o xexit.o xmalloc.o xstrdup.o xstrerror.o # Do we want/need any config overrides? # diff --git a/gnu/usr.bin/cvs/lib/Makefile.in b/gnu/usr.bin/cvs/lib/Makefile.in index 12f89c8e248..f35baae0b60 100644 --- a/gnu/usr.bin/cvs/lib/Makefile.in +++ b/gnu/usr.bin/cvs/lib/Makefile.in @@ -12,13 +12,9 @@ # 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. - -# $CVSid: @(#)Makefile.in 1.21 94/09/24 $ srcdir = @srcdir@ top_srcdir = @top_srcdir@ +cvs_srcdir = @top_srcdir@/src VPATH = @srcdir@ SHELL = /bin/sh @@ -27,47 +23,46 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ SOURCES = \ - alloca.c \ argmatch.c \ dup2.c \ - error.c \ + fncase.c \ fnmatch.c \ ftruncate.c \ getdate.c \ getdate.y \ + getline.c \ getopt.c \ getopt1.c \ - getwd.c \ hostname.c \ md5.c \ memmove.c \ mkdir.c \ regex.c \ rename.c \ - save-cwd.c \ + savecwd.c \ sighandle.c \ - strdup.c \ strstr.c \ strerror.c \ - strippath.c \ stripslash.c \ + strtoul.c \ valloc.c \ waitpid.c \ xgetwd.c \ yesno.c -HEADERS = getopt.h fnmatch.h regex.h system.h wait.h md5.h error.h save-cwd.h +HEADERS = getline.h getopt.h fnmatch.h regex.h system.h wait.h md5.h savecwd.h +# See long comment in ../configure.in concerning inclusion of regex.o. OBJECTS = \ - @ALLOCA@ @LIBOBJS@ \ + @LIBOBJS@ \ argmatch.o \ - error.o \ + getline.o \ getopt.o \ getopt1.o \ md5.o \ - save-cwd.o \ + regex.o \ + savecwd.o \ sighandle.o \ - strippath.o \ stripslash.o \ xgetwd.o \ yesno.o \ @@ -75,19 +70,20 @@ OBJECTS = \ DISTFILES = \ .cvsignore ChangeLog ChangeLog.fsf Makefile.in \ - ${SOURCES} ${HEADERS} + ${SOURCES} ${HEADERS} build_lib.com DEFS = @DEFS@ RANLIB = @RANLIB@ CC = @CC@ -CFLAGS = -g +CFLAGS = @CFLAGS@ CPPFLAGS= YACC = @YACC@ .c.o: - $(CC) $(CPPFLAGS) -I.. -I$(srcdir) $(DEFS) $(CFLAGS) -c $< + $(CC) $(CPPFLAGS) -I.. -I$(srcdir) -I$(cvs_srcdir) \ + $(DEFS) $(CFLAGS) -c $< all: libcvs.a .PHONY: all @@ -95,6 +91,9 @@ all: libcvs.a install: all .PHONY: install +installdirs: +.PHONY: installdirs + tags: $(DISTFILES) ctags `for i in $(DISTFILES); do echo $(srcdir)/$$i; done` @@ -144,9 +143,11 @@ getdate.c: getdate.y fnmatch.o: fnmatch.h getopt1.o: getopt.h regex.o: regex.h -getwd.o: system.h md5.o: md5.h +xlint: + @echo xlint does nothing + subdir = lib Makefile: ../config.status Makefile.in cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status -- cgit v1.2.3