about summary refs log tree commit diff
path: root/MakeTAGS
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-03-25 17:48:26 +0000
committerRoland McGrath <roland@gnu.org>1996-03-25 17:48:26 +0000
commit857fa1b81d522573da671e54e5d3149698e54a0d (patch)
tree2bdd9c03003f918733781576b9a8c220fa36dc10 /MakeTAGS
parent25c931a18c141a40af5297416182d011c0325b9f (diff)
downloadglibc-857fa1b81d522573da671e54e5d3149698e54a0d.tar.gz
glibc-857fa1b81d522573da671e54e5d3149698e54a0d.tar.xz
glibc-857fa1b81d522573da671e54e5d3149698e54a0d.zip
Mon Mar 25 03:35:16 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
	* malloc/malloc.c (morecore): Don't attempt recursive realloc of info
	table when _heaplimit==0 during realloc growing large block.

	* MakeTAGS (extract): Remove /dev/null from xgettext command line.
	(text-srcs): New variable: extract only C sources from $(tags_sources).
	(po/$(domain).pot): Depend on that.
	If it's empty, cp /dev/null $@ instead of $(extract).

	* misc/Makefile (headers): Add iovec.h.
	* sysdeps/unix/sysv/linux/iovec.h: New file.
	* sysdeps/generic/iovec.h: New file.
	* misc/sys/uio.h (struct iovec): Type replaced with #include <iovec.h>.

	* configure.in (NO_UNDERSCORES check): Use AC_TRY_LINK instead of
	AC_TRY_COMPILE.

	* misc/sys/cdefs.h [__USE_BSD] (const, signed, volatile): Move these
	macros inside [! __STDC__].

	* stdlib/rpmatch.c: New file.
	* stdlib/Makefile (routines): Add rpmatch.
	* stdlib/stdlib.h [__USE_SVID]: Declare rpmatch.

	* MakeTAGS (MSGJOIN): Variable removed.
	(po/SYS_libc.pot): Use $(XGETTEXT) instead of $(MSGJOIN).

Wed Mar 20 20:08:46 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysdep.h: Don't define C_SYMBOL_NAME.

	* sysdeps/unix/sysv/linux/m68k/sysdep.h: Don't define
	NO_UNDERSCORES.
Diffstat (limited to 'MakeTAGS')
-rw-r--r--MakeTAGS15
1 files changed, 9 insertions, 6 deletions
diff --git a/MakeTAGS b/MakeTAGS
index 1a32d6d480..0217a68c10 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -118,9 +118,6 @@ endif # subdir
 ifndef XGETTEXT
 XGETTEXT = xgettext
 endif
-ifndef MSGJOIN
-MSGJOIN = msgjoin
-endif
 
 P = $(..)po
 
@@ -133,11 +130,17 @@ endif
 define extract
 @rm -f $@.new
 $(XGETTEXT) --keyword=_ --keyword=N_ --sort-output -d - \
-	    $(XGETTEXTFLAGS-$(@F)) > $@.new /dev/null $^
+	    $(XGETTEXTFLAGS-$(@F)) > $@.new $^
 mv -f $@.new $@
 endef
 
-$P/$(domain).pot: $(tags_sources); $(extract)
+text-srcs := $(filter %.c %.h %.cc %.C,$(tags_sources))
+$P/$(domain).pot: $(text-srcs)
+ifeq (,$(text-srcs))
+	cp /dev/null $@
+else
+	$(extract)
+endif
 
 $P/siglist.pot: $(common-objpfx)siglist.c; $(extract)
 $P/errlist.pot: $(..)sysdeps/mach/hurd/errlist.c; $(extract)
@@ -152,7 +155,7 @@ all-pot = $P/libc-top.pot $(subdirs:%=$P/%.pot) \
 ifndef subdir
 $P/SYS_libc.pot: $(all-pot)
 	@rm -f $@.new
-	$(MSGJOIN) $^ > $@.new
+	$(XGETTEXT) -d - --omit-header $^ > $@.new
 	mv -f $@.new $@
 	test ! -d CVS || cvs ci -m'Regenerated from source files' $@