summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-12-13 03:12:27 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-12-13 03:12:27 +0000
commitdbd8f3b043e4fa789d7a01d63cd5440f6791397e (patch)
tree89e93325f3a5c77e60f1f27d4b0fe6729cb868a0 /gnu/usr.bin
parent773272f17854d3c28cb04a00c7aa53e918c60a8f (diff)
Two more places where we can use the libc getopt_long() instead of GNU getopt()
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/texinfo/lib/Makefile.am5
-rw-r--r--gnu/usr.bin/texinfo/lib/Makefile.in13
2 files changed, 6 insertions, 12 deletions
diff --git a/gnu/usr.bin/texinfo/lib/Makefile.am b/gnu/usr.bin/texinfo/lib/Makefile.am
index c6a18322490..df65d78bd26 100644
--- a/gnu/usr.bin/texinfo/lib/Makefile.am
+++ b/gnu/usr.bin/texinfo/lib/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.4 2002/06/10 13:51:03 espie Exp $
+# $Id: Makefile.am,v 1.5 2002/12/13 03:12:26 millert Exp $
# Makefile.am for texinfo/lib.
# Run automake in .. to produce Makefile.in from this.
#
@@ -14,8 +14,7 @@ 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 gettext.h substring.c system.h \
- xexit.c xmalloc.c xstrdup.c
+libtxi_a_SOURCES = gettext.h substring.c system.h xexit.c xmalloc.c xstrdup.c
libtxi_a_LIBADD = @LIBOBJS@ @ALLOCA@
libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)
diff --git a/gnu/usr.bin/texinfo/lib/Makefile.in b/gnu/usr.bin/texinfo/lib/Makefile.in
index 5096ccdbf01..533bf4c5c9f 100644
--- a/gnu/usr.bin/texinfo/lib/Makefile.in
+++ b/gnu/usr.bin/texinfo/lib/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.in,v 1.3 2002/06/10 13:51:03 espie Exp $
+# $Id: Makefile.in,v 1.4 2002/12/13 03:12:26 millert Exp $
# Makefile.am for texinfo/lib.
# Run automake in .. to produce Makefile.in from this.
#
@@ -116,8 +116,7 @@ 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 gettext.h substring.c system.h \
- xexit.c xmalloc.c xstrdup.c
+libtxi_a_SOURCES = gettext.h substring.c system.h xexit.c xmalloc.c xstrdup.c
libtxi_a_LIBADD = @LIBOBJS@ @ALLOCA@
libtxi_a_DEPENDENCIES = $(libtxi_a_LIBADD)
@@ -130,8 +129,7 @@ CONFIG_CLEAN_FILES =
LIBRARIES = $(noinst_LIBRARIES)
libtxi_a_AR = $(AR) cru
-am_libtxi_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \
- substring.$(OBJEXT) xexit.$(OBJEXT) xmalloc.$(OBJEXT) \
+am_libtxi_a_OBJECTS = substring.$(OBJEXT) xexit.$(OBJEXT) xmalloc.$(OBJEXT) \
xstrdup.$(OBJEXT)
libtxi_a_OBJECTS = $(am_libtxi_a_OBJECTS)
@@ -145,8 +143,7 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/alloca.Po $(DEPDIR)/memcpy.Po \
@AMDEP_TRUE@ $(DEPDIR)/memmove.Po $(DEPDIR)/strcasecmp.Po \
@AMDEP_TRUE@ $(DEPDIR)/strdup.Po $(DEPDIR)/strerror.Po \
-@AMDEP_TRUE@ $(DEPDIR)/strncasecmp.Po ./$(DEPDIR)/getopt.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/substring.Po \
+@AMDEP_TRUE@ $(DEPDIR)/strncasecmp.Po ./$(DEPDIR)/substring.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xexit.Po ./$(DEPDIR)/xmalloc.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xstrdup.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -191,8 +188,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strncasecmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/substring.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xexit.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@