Consistently include Makeconfig after defining subdir.

[thirdparty/glibc.git] / nis / Makefile

diff --git a/nis/Makefile b/nis/Makefile
index 7c70c9c2a8c7833bc80d8445275973ace02f6aff..76886047aaeebf0ae9631117eb54a3ff248aa0af 100644 (file)
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -1,29 +1,32 @@
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 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
-# modify it under the terms of the GNU Library General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 
 # The GNU C Library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# Lesser 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
 
 #
 #      Makefile for NIS/NIS+ part.
 #
 subdir := nis
 
-headers                        := $(wildcard rpcsvc/*.[hx]) bits/nislib.h
-distribute             := nss-nis.h nss-nisplus.h nis_intern.h Banner \
-                       nisplus-parser.h
+include ../Makeconfig
+
+aux                    := nis_hash
+
+ifeq ($(link-obsolete-rpc),yes)
+headers                        := $(wildcard rpcsvc/*.[hx])
+endif
 
 # These are the databases available for the nis (and perhaps later nisplus)
 # service.  This must be a superset of the services in nss.
@@ -43,28 +46,27 @@ 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_clone\
-                  nis_cache 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 lckcache\
-                 nis_findserv
-libnsl-map     = libnsl.map
+                 nis_modify nis_remove nis_add nis_defaults\
+                 nis_findserv nis_callback nis_clone_dir nis_clone_obj\
+                 nis_clone_res nss-default
 
-libnss_compat-routines := $(addprefix compat-,grp pwd spwd) nisplus-parser
-libnss_compat-inhibit-o        = $(filter-out .so,$(object-suffixes))
-libnss_compat-map      := libnss_compat.map
+libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups)
+libnss_compat-inhibit-o        = $(filter-out .os,$(object-suffixes))
 
-libnss_nis-routines    := $(addprefix nis-,$(databases))
-libnss_nis-inhibit-o   = $(filter-out .so,$(object-suffixes))
-libnss_nis-map         := libnss_nis.map
+libnss_nis-routines    := $(addprefix nis-,$(databases)) nis-initgroups \
+                          nss-nis
+libnss_nis-inhibit-o   = $(filter-out .os,$(object-suffixes))
 
-libnss_nisplus-routines        := $(addprefix nisplus-,$(databases)) nisplus-parser
-libnss_nisplus-inhibit-o = $(filter-out .so,$(object-suffixes))
-libnss_nisplus-map     := libnss_nisplus.map
+libnss_nisplus-routines        := $(addprefix nisplus-,$(databases)) nisplus-parser \
+                          nss-nisplus nisplus-initgroups
+libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
 
 include ../Rules
 
@@ -74,10 +76,12 @@ $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
                        $(common-objpfx)nss/libnss_files.so
 $(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
+# Target-specific variable setting to link objects using deprecated
+# RPC interfaces with the version of libc.so that makes them available
+# for new links:
+$(services:%=$(objpfx)libnss_%.so) $(objpfx)libnsl.so: \
+  libc-for-link = $(libnsl-libc)
 
 
 ifeq ($(build-shared),yes)