Changes to gnats/libiberty/Makefile.in

[Milan Zamazal]

Index: gnats/libiberty/Makefile.in
diff -c gnats/libiberty/Makefile.in:1.2 gnats/libiberty/Makefile.in:1.3
*** gnats/libiberty/Makefile.in:1.2     Tue Oct 26 03:10:16 1999
--- gnats/libiberty/Makefile.in Mon Dec 10 18:03:27 2001
***************
*** 1,6 ****
  #
  # Makefile
! #   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
  #   Free Software Foundation
  #
  # This file is part of the libiberty library.
--- 1,6 ----
  #
  # Makefile
! #   Copyright (C) 1990, 91-99, 2000
  #   Free Software Foundation
  #
  # This file is part of the libiberty library.
***************
*** 92,97 ****
--- 92,100 ----
        "libsubdir=$(libsubdir)" \
        "tooldir=$(tooldir)"
  
+ # Subdirectories to recurse into. We need to override this during cleaning
+ SUBDIRS = testsuite
+ 
  all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
  
***************
*** 101,112 ****
  
  @host_makefile_frag@
  
! INCDIR=$(srcdir)/$(MULTISRCTOP)../include
  
! COMPILE.c = $(CC) -c @DEFS@ $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES)
  .c.o:
!       test x"$(enable_shared)" != xyes || \
!         $(COMPILE.c) $(PICFLAG) $< -o pic/$@
        $(COMPILE.c) $<
  
  info: info-subdir
--- 104,116 ----
  
  @host_makefile_frag@
  
! INCDIR=$(srcdir)/include
  
! COMPILE.c = $(CC) -c @DEFS@ $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES) 
@ac_libiberty_warn_cflags@
  .c.o:
!       if [ x"$(PICFLAG)" != x ]; then \
!         $(COMPILE.c) $(PICFLAG) $< -o pic/$@; \
!       else true; fi
        $(COMPILE.c) $<
  
  info: info-subdir
***************
*** 120,145 ****
  # NOTE: If you add new files to the library, add them to this list
  # (alphabetical), and add them to REQUIRED_OFILES or funcs in
  # configure.in.
! 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 mkstemps.c objalloc.c obstack.c \
!       pexecute.c putenv.c random.c rename.c rindex.c setenv.c sigsetmask.c \
!       spaces.c splay-tree.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 xstrdup.c xstrerror.c
  
  # These are always included in the library.
! REQUIRED_OFILES = argv.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 \
!   splay-tree.o strerror.o strsignal.o xatexit.o xexit.o xmalloc.o \
!   xstrdup.o xstrerror.o
  
  $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA)
!       rm -f $(TARGETLIB)
        $(AR) $(AR_FLAGS) $(TARGETLIB) \
          $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA)
        $(RANLIB) $(TARGETLIB)
--- 124,154 ----
  # NOTE: If you add new files to the library, add them to this list
  # (alphabetical), and add them to REQUIRED_OFILES or funcs in
  # configure.in.
! CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c        
      \
!       bzero.c calloc.c choose-temp.c clock.c concat.c cplus-dem.c           \
!         cp-demangle.c dyn-string.c fdmatch.c fnmatch.c getcwd.c               
      \
!       getpwd.c getopt.c getopt1.c getpagesize.c getruntime.c                \
!       floatformat.c hashtab.c hex.c index.c insque.c lbasename.c            \
!       md5.c memchr.c                                                        \
!       memcmp.c memcpy.c memmove.c memset.c mkstemps.c objalloc.c obstack.c  \
!       partition.c pexecute.c putenv.c random.c rename.c rindex.c setenv.c   \
!       sigsetmask.c safe-ctype.c sort.c spaces.c splay-tree.c strcasecmp.c   \
!       strncasecmp.c strchr.c strdup.c strerror.c strncmp.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 xmemdup.c xstrdup.c xstrerror.c
  
  # These are always included in the library.
! REQUIRED_OFILES = argv.o choose-temp.o concat.o cplus-dem.o cp-demangle.o     
\
!       dyn-string.o fdmatch.o fnmatch.o getopt.o getopt1.o getpwd.o          \
!       getruntime.o hashtab.o hex.o floatformat.o lbasename.o md5.o          \
!       objalloc.o obstack.o                                                  \
!       partition.o pexecute.o safe-ctype.o sort.o spaces.o splay-tree.o      \
!       strerror.o strsignal.o xatexit.o xexit.o xmalloc.o xmemdup.o          \
!       xstrdup.o xstrerror.o
  
  $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA)
!       -rm -f $(TARGETLIB)
        $(AR) $(AR_FLAGS) $(TARGETLIB) \
          $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA)
        $(RANLIB) $(TARGETLIB)
***************
*** 148,169 ****
  install: install_to_$(INSTALL_DEST) install-subdir
  
  install_to_libdir: all
!       $(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$(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
  
  # needed-list is used by libstdc++.  NEEDED is the list of functions
  # to include there.  Do not add anything LGPL to this list; libstdc++
  # can't use anything encumbering.
  NEEDED = atexit calloc memchr memcmp memcpy memmove memset rename strchr \
!        strerror strrchr strstr strtol strtoul tmpnam vfprintf vprintf \
         vfork waitpid bcmp bcopy bzero
  needed-list: Makefile
        rm -f needed-list; touch needed-list; \
--- 157,178 ----
  install: install_to_$(INSTALL_DEST) install-subdir
  
  install_to_libdir: all
!       $(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$(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
  
  # needed-list is used by libstdc++.  NEEDED is the list of functions
  # to include there.  Do not add anything LGPL to this list; libstdc++
  # can't use anything encumbering.
  NEEDED = atexit calloc memchr memcmp memcpy memmove memset rename strchr \
!        strerror strncmp strrchr strstr strtol strtoul tmpnam vfprintf vprintf 
\
         vfork waitpid bcmp bcopy bzero
  needed-list: Makefile
        rm -f needed-list; touch needed-list; \
***************
*** 181,187 ****
        echo $(REQUIRED_OFILES) > required-list
  
  stamp-picdir:
!       if [ x"$(enable_shared)" = xyes ] && [ ! -d pic ]; then \
          mkdir pic; \
        else true; fi
        touch stamp-picdir
--- 190,196 ----
        echo $(REQUIRED_OFILES) > required-list
  
  stamp-picdir:
!       if [ x"$(PICFLAG)" != x ] && [ ! -d pic ]; then \
          mkdir pic; \
        else true; fi
        touch stamp-picdir
***************
*** 204,242 ****
  
  # Need to deal with profiled libraries, too.
  
  mostlyclean: mostlyclean-subdir
!       rm -rf *.o pic core errs \#* *.E a.out
!       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 clean-subdir
!       rm -f *.a required-list tmpmulti.out
        @$(MULTICLEAN) multi-clean DO=clean
! distclean: clean distclean-subdir
        @$(MULTICLEAN) multi-clean DO=distclean
!       rm -f *~ Makefile config.status xhost-mkfrag TAGS multilib.out
!       rm -f config.log
! maintainer-clean realclean: distclean maintainer-clean-subdir
  
  force:
  
  Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
  
  config.h: stamp-h ; @true
! stamp-h: config.in config.status
        CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
  
  config.status: $(srcdir)/configure $(srcdir)/config.table
        $(SHELL) ./config.status --recheck
  
  
  all-subdir check-subdir installcheck-subdir info-subdir       \
  install-info-subdir clean-info-subdir dvi-subdir install-subdir       \
  etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
! maintainer-clean-subdir:
!       @target=`echo $@ | sed -e 's/-subdir//'`; \
!       cd testsuite && $(MAKE) $$target
  
  $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA): stamp-picdir
  
--- 213,265 ----
  
  # Need to deal with profiled libraries, too.
  
+ # Cleaning has to be done carefully to ensure that we don't clean our SUBDIRS
+ # multiple times, hence our explicit recursion with an empty SUBDIRS.
  mostlyclean: mostlyclean-subdir
!       -rm -rf *.o pic core errs \#* *.E a.out
!       -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: clean-subdir
!       $(MAKE) SUBDIRS="" mostlyclean
!       -rm -f *.a required-list tmpmulti.out
        @$(MULTICLEAN) multi-clean DO=clean
! distclean: distclean-subdir
!       $(MAKE) SUBDIRS="" clean
        @$(MULTICLEAN) multi-clean DO=distclean
!       -rm -f *~ Makefile config.status xhost-mkfrag TAGS multilib.out
!       -rm -f config.log
!       -rmdir testsuite 2>/dev/null
! maintainer-clean realclean: maintainer-clean-subdir
!       $(MAKE) SUBDIRS="" distclean
  
  force:
  
  Makefile: $(srcdir)/Makefile.in config.status
        CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
  
+ # Depending on Makefile makes sure that config.status has been re-run
+ # if needed.  This prevents problems with parallel builds.
  config.h: stamp-h ; @true
! stamp-h: config.in config.status Makefile
        CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
  
  config.status: $(srcdir)/configure $(srcdir)/config.table
        $(SHELL) ./config.status --recheck
  
  
+ # Depending on config.h makes sure that config.status has been re-run
+ # if needed.  This prevents problems with parallel builds, in case
+ # subdirectories need to run config.status also.
  all-subdir check-subdir installcheck-subdir info-subdir       \
  install-info-subdir clean-info-subdir dvi-subdir install-subdir       \
  etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
! maintainer-clean-subdir: config.h
!       @subdirs='$(SUBDIRS)'; \
!       target=`echo $@ | sed -e 's/-subdir//'`; \
!       for dir in $$subdirs ; do \
!         cd $$dir && $(MAKE) $$target; \
!       done
  
  $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA): stamp-picdir
  
***************
*** 248,273 ****
  clock.o: config.h
  concat.o: $(INCDIR)/libiberty.h
  cplus-dem.o: config.h $(INCDIR)/demangle.h
  fdmatch.o: $(INCDIR)/libiberty.h
  fnmatch.o: config.h $(INCDIR)/fnmatch.h
  getcwd.o: config.h
  getopt.o: config.h $(INCDIR)/getopt.h
  getopt1.o: config.h $(INCDIR)/getopt.h
  getpagesize.o: config.h
  getruntime.o: config.h $(INCDIR)/libiberty.h
  hex.o: $(INCDIR)/libiberty.h
  floatformat.o: $(INCDIR)/floatformat.h
  mkstemps.o: config.h
! objalloc.o: $(INCDIR)/objalloc.h
  obstack.o: config.h $(INCDIR)/obstack.h
  pexecute.o: config.h $(INCDIR)/libiberty.h
  setenv.o: config.h
  spaces.o: $(INCDIR)/libiberty.h
  splay-tree.o: config.h $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h 
$(INCDIR)/ansidecl.h
  strerror.o: config.h $(INCDIR)/libiberty.h
  strsignal.o: config.h $(INCDIR)/libiberty.h
  xatexit.o: $(INCDIR)/libiberty.h
! xexit.o: $(INCDIR)/libiberty.h
! xmalloc.o: $(INCDIR)/libiberty.h
  xstrdup.o: config.h $(INCDIR)/libiberty.h
  xstrerror.o: config.h $(INCDIR)/libiberty.h
--- 271,310 ----
  clock.o: config.h
  concat.o: $(INCDIR)/libiberty.h
  cplus-dem.o: config.h $(INCDIR)/demangle.h
+ cp-demangle.o: config.h $(INCDIR)/dyn-string.h $(INCDIR)/demangle.h
+ dyn-string.o: config.h $(INCDIR)/dyn-string.h
  fdmatch.o: $(INCDIR)/libiberty.h
  fnmatch.o: config.h $(INCDIR)/fnmatch.h
  getcwd.o: config.h
  getopt.o: config.h $(INCDIR)/getopt.h
  getopt1.o: config.h $(INCDIR)/getopt.h
  getpagesize.o: config.h
+ getpwd.o: config.h $(INCDIR)/libiberty.h
  getruntime.o: config.h $(INCDIR)/libiberty.h
  hex.o: $(INCDIR)/libiberty.h
  floatformat.o: $(INCDIR)/floatformat.h
+ lbasename.o: $(INCDIR)/libiberty.h
  mkstemps.o: config.h
! md5.o: config.h
! objalloc.o: config.h $(INCDIR)/objalloc.h
  obstack.o: config.h $(INCDIR)/obstack.h
+ partition.o: config.h $(INCDIR)/partition.h
  pexecute.o: config.h $(INCDIR)/libiberty.h
+ rename.o: config.h
  setenv.o: config.h
+ sort.o: config.h $(INCDIR)/sort.h $(INCDIR)/ansidecl.h
  spaces.o: $(INCDIR)/libiberty.h
  splay-tree.o: config.h $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h 
$(INCDIR)/ansidecl.h
  strerror.o: config.h $(INCDIR)/libiberty.h
  strsignal.o: config.h $(INCDIR)/libiberty.h
+ strtol.o: config.h
+ strtoul.o: config.h
+ vasprintf.o: config.h
  xatexit.o: $(INCDIR)/libiberty.h
! xexit.o: config.h $(INCDIR)/libiberty.h
! xmalloc.o: config.h $(INCDIR)/libiberty.h
! xmemdup.o: config.h $(INCDIR)/libiberty.h
  xstrdup.o: config.h $(INCDIR)/libiberty.h
  xstrerror.o: config.h $(INCDIR)/libiberty.h
+ waitpid.o: config.h
+ hashtab.o: config.h $(INCDIR)/libiberty.h $(INCDIR)/hashtab.h 
$(INCDIR)/ansidecl.h