Update.

[platform/upstream/glibc.git] / resolv / Makefile

diff --git a/resolv/Makefile b/resolv/Makefile
index a141fc7..64afbcb 100644 (file)
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994,95,96,97,98,99,2000 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,25 +12,44 @@
 # 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 resolv portion of the library.
 #
 subdir := resolv
 
-headers        := resolv.h netdb.h arpa/nameser.h sys/bitypes.h
-distribute := ../conf/portability.h mapv4v6addr.h mapv4v6hostent.h
+headers        := resolv.h \
+          netdb.h bits/netdb.h \
+          arpa/nameser.h arpa/nameser_compat.h \
+          sys/bitypes.h
+distribute := ../conf/portability.h mapv4v6addr.h mapv4v6hostent.h \
+             Banner res_hconf.h res_debug.h README
 
-routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init
+routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \
+           res_hconf res_libc
 
-extra-libs := libresolv
+tests = tst-aton
+
+include ../Makeconfig
+
+extra-libs := libresolv libnss_dns
 extra-libs-others = $(extra-libs)
-libresolv-routines := gethnamaddr getnetnamadr res_comp res_debug      \
+libresolv-routines := gethnamaddr res_comp res_debug   \
                      res_data res_mkquery res_query res_send           \
-                     inet_net_ntop inet_net_pton inet_neta base64
+                     inet_net_ntop inet_net_pton inet_neta base64      \
+                     ns_parse ns_name ns_netint ns_ttl ns_print        \
+                     ns_samedomain
+
+subdir-dirs = nss_dns
+vpath %.c nss_dns
+
+libnss_dns-routines    := dns-host dns-network
+ifneq ($(build-static-nss),yes)
+libnss_dns-inhibit-o   = $(filter-out .os,$(object-suffixes))
+endif
 
 include ../Rules
 
@@ -41,4 +60,12 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
            -Dgetnetbyaddr=res_getnetbyaddr
 
 # The BIND code elicits some harmless warnings.
-+cflags += -Wno-strict-prototypes -Wno-comment -Wno-write-strings
++cflags += -Wno-strict-prototypes -Wno-write-strings
+
+# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
+# This ensures they will load libc.so for needed symbols if loaded by
+# a statically-linked program that hasn't already loaded it.
+$(objpfx)libresolv.so: $(common-objpfx)libc.so
+
+# The DNS NSS modules needs the resolver.
+$(objpfx)libnss_dns.so: $(objpfx)libresolv.so $(common-objpfx)libc.so