summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-04-15 06:33:21 +0000
committerRoland McGrath <roland@gnu.org>2005-04-15 06:33:21 +0000
commitc9e169479eac36b4dfd20643c2b33ac13a06a41a (patch)
tree3466bfe1d3ffe18dedd0b029df113c746ad68764
parent87e7eef4a607ad111dedf170b9c8dd873815c62d (diff)
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).
-rw-r--r--ChangeLog13
-rw-r--r--MakeTAGS9
-rw-r--r--nscd/Makefile3
3 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e9972c5bec..0046323c49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/MakeTAGS b/MakeTAGS
index bee41252ee..fff6851c91 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -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
diff --git a/nscd/Makefile b/nscd/Makefile
index 9c32c68681..75a9d434f4 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -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