brain-dead cvs conflict merge

1 files changed, 12 insertions, 4 deletions

diff --git a/gnu/usr.bin/texinfo/lib/Makefile.am b/gnu/usr.bin/texinfo/lib/Makefile.am
index 3aef660bf40..c6a18322490 100644
--- a/gnu/usr.bin/texinfo/lib/Makefile.am
+++ b/gnu/usr.bin/texinfo/lib/Makefile.am
@@ -1,12 +1,20 @@
-## Makefile.am for texinfo/lib.
-## $Id: Makefile.am,v 1.3 2000/02/09 02:18:41 espie Exp $
-## Run automake in .. to produce Makefile.in from this.
+# $Id: Makefile.am,v 1.4 2002/06/10 13:51:03 espie Exp $
+# Makefile.am for texinfo/lib.
+# Run automake in .. to produce Makefile.in from this.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 noinst_LIBRARIES = libtxi.a
 INCLUDES = -I../intl
 
 # Don't need to list alloca.c, etc., Automake includes them.
-libtxi_a_SOURCES = getopt.c getopt.h getopt1.c substring.c system.h \
+libtxi_a_SOURCES = getopt.c getopt.h getopt1.c gettext.h substring.c system.h \
                    xexit.c xmalloc.c xstrdup.c
 libtxi_a_LIBADD = @LIBOBJS@ @ALLOCA@
 libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)