daily update

[deliverable/binutils-gdb.git] / libiberty / Makefile.in

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index aa8626d5c006f268ba1db1019015e560cf8e361a..8a1009230cdf47f5bb9954f632c932f6830ea120 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -55,6 +55,7 @@ AR_FLAGS = rc
 
 CC = @CC@
 CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 RANLIB = @RANLIB@
 MAKEINFO = @MAKEINFO@
 PERL = @PERL@
@@ -78,6 +79,7 @@ FLAGS_TO_PASS = \
        "AR_FLAGS=$(AR_FLAGS)" \
        "CC=$(CC)" \
        "CFLAGS=$(CFLAGS)" \
+       "CPPFLAGS=$(CPPFLAGS)" \
        "DESTDIR=$(DESTDIR)" \
        "EXTRA_OFILES=$(EXTRA_OFILES)" \
        "HDEFINES=$(HDEFINES)" \
@@ -98,7 +100,7 @@ FLAGS_TO_PASS = \
 SUBDIRS = testsuite
 
 # FIXME: add @BUILD_INFO@ once we're sure it works for everyone.
-all: stamp-picdir $(TARGETLIB) needed-list required-list all-subdir
+all: stamp-picdir $(TARGETLIB) required-list all-subdir
        @: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
 
 .PHONY: check installcheck
@@ -109,7 +111,7 @@ installcheck: installcheck-subdir
 
 INCDIR=$(srcdir)/$(MULTISRCTOP)../include
 
-COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@
+COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@
 
 # Just to make sure we don't use a built-in rule with VPATH
 .c.o:
@@ -133,8 +135,8 @@ CFILES = alloca.c argv.c asprintf.c atexit.c                                \
        lbasename.c                                                     \
        lrealpath.c                                                     \
        make-relative-prefix.c                                          \
-       make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmove.c     \
-        mempcpy.c memset.c mkstemps.c                                  \
+       make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmem.c      \
+        memmove.c mempcpy.c memset.c mkstemps.c                        \
        objalloc.c obstack.c                                            \
        partition.c pexecute.c                                          \
         pex-common.c pex-djgpp.c pex-msdos.c pex-one.c                 \
@@ -185,8 +187,8 @@ CONFIGURED_OFILES = ./asprintf.o ./atexit.o                         \
        ./ffs.o                                                         \
        ./getcwd.o ./getpagesize.o ./gettimeofday.o                     \
        ./index.o ./insque.o                                            \
-       ./memchr.o ./memcmp.o ./memcpy.o ./memmove.o ./mempcpy.o        \
-        ./memset.o ./mkstemps.o                                        \
+       ./memchr.o ./memcmp.o ./memcpy.o ./memmem.o ./memmove.o         \
+        ./mempcpy.o ./memset.o ./mkstemps.o                            \
        ./pex-djgpp.o ./pex-msdos.o                                     \
         ./pex-unix.o ./pex-win32.o                                     \
         ./putenv.o                                                     \
@@ -375,22 +377,6 @@ install_to_tooldir: all
        mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(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; \
-       for f in $(NEEDED); do \
-         for g in $(LIBOBJS) $(EXTRA_OFILES); do \
-           case "$$g" in \
-             *$$f*) echo $$g >> needed-list ;; \
-           esac; \
-         done; \
-       done
-
 # required-list was used when building a shared bfd/opcodes/libiberty
 # library.  I don't know if it used by anything currently.
 required-list: Makefile
@@ -438,8 +424,8 @@ maint-deps :
 # 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
+       -rm -f errors dummy config.h stamp-*
+       -rm -f $(CONFIG_H) stamp-picdir
        -rm -f libiberty.aux libiberty.cp libiberty.cps libiberty.fn libiberty.ky
        -rm -f libiberty.log libiberty.tmp libiberty.tps libiberty.pg
        -rm -f libiberty.pgs libiberty.toc libiberty.tp libiberty.tpl libiberty.vr
@@ -796,6 +782,12 @@ $(CONFIGURED_OFILES): stamp-picdir
        else true; fi
        $(COMPILE.c) $(srcdir)/memcpy.c $(OUTPUT_OPTION)
 
+./memmem.o: $(srcdir)/memmem.c config.h
+       if [ x"$(PICFLAG)" != x ]; then \
+         $(COMPILE.c) $(PICFLAG) $(srcdir)/memmem.c -o pic/$@; \
+       else true; fi
+       $(COMPILE.c) $(srcdir)/memmem.c $(OUTPUT_OPTION)
+
 ./memmove.o: $(srcdir)/memmove.c $(INCDIR)/ansidecl.h
        if [ x"$(PICFLAG)" != x ]; then \
          $(COMPILE.c) $(PICFLAG) $(srcdir)/memmove.c -o pic/$@; \