diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-06-20 02:28:31 +0200 |
| commit | 0138137f1ccea480fe31cea3b63a81f96daeeaa7 (patch) | |
| tree | ffd88f1e805cd98152828c1598fc3255b3d22a9e /nscd | |
| parent | 27fbc2008d4df23885d10f0877caf62ae2c22bb4 (diff) | |
| parent | dc665715841aea049480d9f75ace426419db1f8e (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
hurd/Makefile
nptl/sysdeps/pthread/bits/libc-lock.h
sysdeps/i386/configure
sysdeps/powerpc/powerpc32/configure
sysdeps/powerpc/powerpc64/configure
sysdeps/unix/sysv/linux/configure
sysdeps/unix/sysv/linux/configure.in
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/Makefile | 11 | ||||
| -rw-r--r-- | nscd/nscd_getgr_r.c | 2 | ||||
| -rw-r--r-- | nscd/nscd_getpw_r.c | 2 | ||||
| -rw-r--r-- | nscd/nscd_getserv_r.c | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index f6965dd9c6..ba052eb9de 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1998,2000,2002-2009,2011 Free Software Foundation, Inc. +# Copyright (C) 1998,2000,2002-2009,2011,2012 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 @@ -46,11 +46,6 @@ extra-objs = $(nscd-modules:=.o) endif -ifeq (yes,$(build-static-nss)) -otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ - $(resolvobjdir)/libresolv.a -endif - all-nscd-modules := $(nscd-modules) selinux ifeq (yes,$(have-selinux)) ifeq (yes,$(have-libaudit)) @@ -74,10 +69,6 @@ endif LDLIBS-nscd = $(selinux-LIBS) -distribute := nscd.h nscd-client.h dbg_log.h \ - $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \ - nscd.conf nscd.init nscd_proto.h nscd-types.h - include ../Rules CFLAGS-nscd_getpw_r.c = -fexceptions diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c index ac3d85fc39..54372e4ef0 100644 --- a/nscd/nscd_getgr_r.c +++ b/nscd/nscd_getgr_r.c @@ -31,7 +31,7 @@ #include <sys/uio.h> #include <sys/un.h> #include <not-cancel.h> -#include <stdio-common/_itoa.h> +#include <_itoa.h> #include "nscd-client.h" #include "nscd_proto.h" diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c index 409b672ee0..e405057d16 100644 --- a/nscd/nscd_getpw_r.c +++ b/nscd/nscd_getpw_r.c @@ -30,7 +30,7 @@ #include <sys/uio.h> #include <sys/un.h> #include <not-cancel.h> -#include <stdio-common/_itoa.h> +#include <_itoa.h> #include "nscd-client.h" #include "nscd_proto.h" diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c index ff85d8299f..acf7e22f82 100644 --- a/nscd/nscd_getserv_r.c +++ b/nscd/nscd_getserv_r.c @@ -20,7 +20,7 @@ #include <errno.h> #include <string.h> #include <not-cancel.h> -#include <stdio-common/_itoa.h> +#include <_itoa.h> #include "nscd-client.h" #include "nscd_proto.h" |