diff options
author | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
commit | 356a10ee3ee36bec0af7e8a1c61e353e0af45904 (patch) | |
tree | 421de93f9f53c04d796ccd31102baf135dc55ed8 /nss/Makefile | |
parent | a20026128cef2e95ffd15fb293dd6b1e9bf3ae1e (diff) | |
parent | e456826d7a539fb322bb9719297bd386eded8e32 (diff) | |
download | glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.gz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.xz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.zip |
Merge branch 'master' into bug13658-branch
Diffstat (limited to 'nss/Makefile')
-rw-r--r-- | nss/Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/nss/Makefile b/nss/Makefile index 65c094d689..13accaa01d 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1996-1998,2000-2002,2007,2009,2010,2011 +# Copyright (C) 1996-1998,2000-2002,2007,2009,2010,2011,2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -22,9 +22,6 @@ subdir := nss headers := nss.h -distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \ - getXXent.c getXXent_r.c databases.def \ - nsswitch.conf digits_dots.c function.def # This is the trivial part which goes into libc itself. routines = nsswitch getnssent getnssent_r digits_dots \ @@ -66,7 +63,6 @@ vpath %.c $(subdir-dirs) ../locale/programs ../intl libnss_files-routines := $(addprefix files-,$(databases)) \ files-initgroups files-have_o_cloexec files-init -distribute += files-XXX.c files-parse.c libnss_db-dbs := $(addprefix db-,\ $(filter-out hosts network key alias,\ @@ -75,7 +71,6 @@ libnss_db-dbs := $(addprefix db-,\ libnss_db-routines := $(libnss_db-dbs) db-open db-init hash-string generated += $(filter-out db-alias.c db-netgrp.c, \ $(addsuffix .c,$(libnss_db-dbs))) -distribute += $(addprefix nss_db/, db-XXX.c nss_db.h) install-others += $(inst_vardbdir)/Makefile @@ -118,8 +113,6 @@ $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o) $(inst_vardbdir)/Makefile: db-Makefile $(+force) $(do-install) -distribute += nss_test1.c - CFLAGS-nss_test1.c = -DNOT_IN_libc=1 $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(common-objpfx)libc.so \ $(common-objpfx)libc_nonshared.a |