2005-04-14  Roland McGrath  <roland@redhat.com>
	* MakeTAGS ($P/$(domain).pot): Depend on distinfo file as well.
	(extract): Filter-out distinfo file name.

	[BZ #253]
	* MakeTAGS (text-srcs): Match %.bash.in files too.

	[BZ #253]
	* nscd/Makefile (all-nscd-modules): New variable, include selinux
	module regardless of configuration.
	(distribute): Use that instead of $(nscd-modules).
This commit is contained in:
Roland McGrath 2005-04-15 06:33:21 +00:00
parent 87e7eef4a6
commit c9e169479e
3 changed files with 20 additions and 5 deletions

View File

@ -1,3 +1,16 @@
2005-04-14 Roland McGrath <roland@redhat.com>
* MakeTAGS ($P/$(domain).pot): Depend on distinfo file as well.
(extract): Filter-out distinfo file name.
[BZ #253]
* MakeTAGS (text-srcs): Match %.bash.in files too.
[BZ #253]
* nscd/Makefile (all-nscd-modules): New variable, include selinux
module regardless of configuration.
(distribute): Use that instead of $(nscd-modules).
2005-04-13 David S. Miller <davem@davemloft.net>
Add sparc64 TLS and NPTL support.

View File

@ -1,5 +1,5 @@
# Make the TAGS files.
# Copyright (C) 1992,1994,1995,1996,1998,2002,2003
# Copyright (C) 1992,1994,1995,1996,1998,2002,2003,2005
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@ -146,12 +146,13 @@ endif
define extract
@rm -f $@.new
$(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS --sort-by-file \
--omit-header -E -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new $^
--omit-header -E -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new \
$(filter-out $(objpfx)distinfo,$^)
mv -f $@.new $@
endef
text-srcs := $(filter %.c %.h %.cc %.C,$(tags_sources))
$P/$(domain).pot: $(text-srcs)
text-srcs := $(filter %.c %.h %.cc %.C %.bash.in,$(tags_sources))
$P/$(domain).pot: $(objpfx)distinfo $(text-srcs)
ifeq (,$(text-srcs))
cp /dev/null $@
else

View File

@ -51,6 +51,7 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a
endif
all-nscd-modules := $(nscd-modules) selinux
ifeq (yes,$(have-selinux))
nscd-modules += selinux
selinux-LIBS := -lselinux
@ -59,7 +60,7 @@ endif
LDLIBS-nscd = $(selinux-LIBS)
distribute := nscd.h nscd-client.h dbg_log.h \
$(addsuffix .c, $(filter-out xmalloc, $(nscd-modules))) \
$(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
nscd_nischeck.c nscd.conf nscd.init nscd_proto.h \
nscd-types.h