Update.

[glibc.git] / misc / Makefile

diff --git a/misc/Makefile b/misc/Makefile
index ff633544de06c42b64f223306848ec0272a0a267..e64451fe224ccacbd95b24a5a9aa6ffec83d1b58 100644 (file)
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# License along with the GNU C Library; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 #
 #      Sub-makefile for misc portion of the library.
@@ -22,11 +22,14 @@
 
 subdir := misc
 
-headers        := sys/uio.h sys/ioctl.h sys/ptrace.h ioctls.h sys/file.h       \
-          a.out.h nlist.h stab.h stab.def sgtty.h sys/dir.h sys/cdefs.h \
-          ttyent.h syscall.h syslog.h sys/syslog.h paths.h sys/reboot.h \
-          sys/mman.h sys/param.h fstab.h mntent.h search.h utmp.h       \
-          err.h error.h sys/queue.h sysexits.h
+headers        := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
+          sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
+          ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
+          ttyent.h syslog.h sys/syslog.h paths.h sys/reboot.h \
+          sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h \
+          sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
+          sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \
+          regexp.h bits/select.h bits/mman.h
 
 routines := brk sbrk sstk ioctl \
            readv writev \
@@ -35,41 +38,53 @@ routines := brk sbrk sstk ioctl \
            getpagesize \
            getdtsz \
            gethostname sethostname getdomain setdomain \
-           select \
-           acct chroot fsync sync reboot \
+           select pselect \
+           acct chroot fsync sync fdatasync reboot \
            gethostid sethostid \
            revoke vhangup \
-           swapon mktemp mkstemp \
+           swapon swapoff mktemp mkstemp mkdtemp \
            ualarm usleep \
            gtty stty \
-           ptrace nlist \
-           fstab mntent \
+           ptrace \
+           fstab mntent mntent_r \
            utimes \
-           truncate ftruncate \
+           truncate ftruncate truncate64 ftruncate64 \
            chflags fchflags \
            insremque getttyent getusershell getpass ttyslot \
            syslog syscall daemon \
-           mmap munmap mprotect msync madvise \
-           efgcvt efgcvt_r \
-           hsearch hsearch_r tsearch \
-           err error
+           mmap munmap mprotect msync madvise mmap64 mincore \
+           efgcvt efgcvt_r qefgcvt qefgcvt_r \
+           hsearch hsearch_r tsearch lsearch \
+           err error ustat \
+           getsysstats dirname regexp \
+           getloadavg
+
+include ../Makeconfig
+
 aux := init-misc
-distribute := bsd-compat.c
-extra-objs := bsd-compat.o
+ifeq ($(build-static),yes)
 install-lib := libbsd-compat.a libg.a
-non-lib.a := libbsd-compat.a
+endif
 gpl2lgpl := error.c error.h
 
-# Build the -lutil library with these extra functions.
-extra-libs     := libutil
-libutil-routines:= login login_tty logout logwtmp pty
+tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent
 
+CFLAGS-tsearch.c = $(exceptions)
+CFLAGS-lsearch.c = $(exceptions)
 
 include ../Rules
 
+$(objpfx)libbsd-compat.a: $(dep-dummy-lib); $(make-dummy-lib)
+$(objpfx)libg.a: $(dep-dummy-lib); $(make-dummy-lib)
 
-$(objpfx)libbsd-compat.a: $(objpfx)bsd-compat.o
-       rm -f $@
-       ln $< $@
+CFLAGS-init-misc.c = -fkeep-inline-functions
 
-$(objpfx)libg.a: $(dep-dummy-lib); $(make-dummy-lib)
+ifeq ($(build-shared),yes)
+$(objpfx)tst-tsearch: $(common-objpfx)math/libm.so$(libm.so-version)
+else
+$(objpfx)tst-tsearch: $(common-objpfx)math/libm.a
+endif
+
+ifeq ($(build-bounded),yes)
+$(objpfx)tst-tsearch-bp: $(common-objpfx)math/libm_b.a
+endif