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 /hesiod/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 'hesiod/Makefile')
-rw-r--r-- | hesiod/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hesiod/Makefile b/hesiod/Makefile index 6c31a08782..b9f9b07188 100644 --- a/hesiod/Makefile +++ b/hesiod/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 2000, 2001, 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 @@ -20,8 +20,6 @@ # subdir := hesiod -distribute := hesiod.h hesiod_p.h README.hesiod nss_hesiod/nss_hesiod.h - extra-libs := libnss_hesiod extra-libs-others = $(extra-libs) @@ -29,7 +27,7 @@ subdir-dirs = nss_hesiod vpath %.c nss_hesiod libnss_hesiod-routines := hesiod hesiod-grp hesiod-init hesiod-proto \ - hesiod-pwd hesiod-service + hesiod-pwd hesiod-service # Build only shared library libnss_hesiod-inhibit-o = $(filter-out .os,$(object-suffixes)) @@ -41,6 +39,6 @@ include ../Rules # The Hesiod NSS modules also needs the resolver and some help from # the file service. $(objpfx)libnss_hesiod.so: $(common-objpfx)resolv/libresolv.so \ - $(common-objpfx)nss/libnss_files.so \ - $(common-objpfx)libc.so \ + $(common-objpfx)nss/libnss_files.so \ + $(common-objpfx)libc.so \ $(common-objpfx)libc_nonshared.a |