Clean up internal fopen uses

[thirdparty/glibc.git] / nis / Makefile

diff --git a/nis/Makefile b/nis/Makefile
index fa5c4dfd304113ec81bd18239423911c48cd195f..e7e5f0c78a1d6fa313817fa9eb6bec4dc54d0e73 100644 (file)
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1998, 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998,2001,2004,2006,2011 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
@@ -23,9 +23,9 @@ subdir        := nis
 
 aux                    := nis_hash
 
-headers                        := $(wildcard rpcsvc/*.[hx])
 distribute             := nss-nis.h nss-nisplus.h nis_intern.h Banner \
-                          nisplus-parser.h nis_xdr.h nss
+                          nisplus-parser.h nis_xdr.h nss \
+                          $(wildcard rpcsvc/*.[hx])
 
 # These are the databases available for the nis (and perhaps later nisplus)
 # service.  This must be a superset of the services in nss.
@@ -45,16 +45,16 @@ subdir-dirs = $(services:%=nss_%)
 vpath %.c $(subdir-dirs)
 
 libnsl-routines = yp_xdr ypclnt ypupdate_xdr \
-                  nis_subr nis_local_names nis_free nis_file \
-                  nis_print nis_error nis_call nis_lookup\
-                  nis_table nis_xdr nis_server nis_ping \
+                 nis_subr nis_local_names nis_free nis_file \
+                 nis_print nis_error nis_call nis_lookup\
+                 nis_table nis_xdr nis_server nis_ping \
                  nis_checkpoint nis_mkdir nis_rmdir nis_getservlist\
                  nis_verifygroup nis_ismember nis_addmember nis_util\
                  nis_removemember nis_creategroup nis_destroygroup\
                  nis_print_group_entry nis_domain_of nis_domain_of_r\
                  nis_modify nis_remove nis_add nis_defaults\
                  nis_findserv nis_callback nis_clone_dir nis_clone_obj\
-                 nis_clone_res
+                 nis_clone_res nss-default
 
 libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups)
 libnss_compat-inhibit-o        = $(filter-out .os,$(object-suffixes))
@@ -64,7 +64,7 @@ libnss_nis-routines   := $(addprefix nis-,$(databases)) nis-initgroups \
 libnss_nis-inhibit-o   = $(filter-out .os,$(object-suffixes))
 
 libnss_nisplus-routines        := $(addprefix nisplus-,$(databases)) nisplus-parser \
-                          nss-nisplus
+                          nss-nisplus nisplus-initgroups
 libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
 
 include ../Rules
@@ -78,7 +78,8 @@ $(objpfx)libnss_nisplus.so: $(objpfx)libnsl.so$(libnsl.so-version)
 # 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.
-$(services:%=$(objpfx)libnss_%.so) $(objpfx)libnsl.so: $(common-objpfx)libc.so\
+libnsl-libc = $(common-objpfx)linkobj/libc.so
+$(services:%=$(objpfx)libnss_%.so) $(objpfx)libnsl.so: $(libnsl-libc) \
                                               $(common-objpfx)libc_nonshared.a