summaryrefslogtreecommitdiffstats
path: root/gettext-runtime/lib
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2005-01-12 12:45:18 +0000
committerBruno Haible <bruno@clisp.org>2009-06-23 12:12:00 +0200
commit3d121ef5998ebb5c301b57868763dd43e75bb3ae (patch)
treedf424f1398bbde8271bd18fa5dff05bf64d3dc0b /gettext-runtime/lib
parent2384f17f3d4c334f22dc3447bf55d2764114cd4f (diff)
downloadexternal_gettext-3d121ef5998ebb5c301b57868763dd43e75bb3ae.zip
external_gettext-3d121ef5998ebb5c301b57868763dd43e75bb3ae.tar.gz
external_gettext-3d121ef5998ebb5c301b57868763dd43e75bb3ae.tar.bz2
Update 'getopt' module from gnulib.
Diffstat (limited to 'gettext-runtime/lib')
-rw-r--r--gettext-runtime/lib/ChangeLog9
-rw-r--r--gettext-runtime/lib/Makefile.am18
2 files changed, 25 insertions, 2 deletions
diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog
index 20a85ec..c6f22f3 100644
--- a/gettext-runtime/lib/ChangeLog
+++ b/gettext-runtime/lib/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-06 Bruno Haible <bruno@clisp.org>
+
+ * Makefile.am (libgrt_a_SOURCES): Remove getopt files.
+ (LIBADD_SOURCE): Add getopt files here, except getopt.h.
+ (BUILT_SOURCES): New variable.
+ (EXTRA_DIST, all-local, getopt.h): Support for getopt module.
+ * getopt.c: New file.
+ * getopt1.c: New file.
+
2004-01-29 Bruno Haible <bruno@clisp.org>
* gettext-0.14.1 released.
diff --git a/gettext-runtime/lib/Makefile.am b/gettext-runtime/lib/Makefile.am
index 51a830d..87e4de8 100644
--- a/gettext-runtime/lib/Makefile.am
+++ b/gettext-runtime/lib/Makefile.am
@@ -1,5 +1,5 @@
## Makefile for the gettext-runtime/lib subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2004 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2005 Free Software Foundation, Inc.
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
EXTRA_DIST =
+BUILT_SOURCES =
MOSTLYCLEANFILES =
noinst_LIBRARIES = libgrt.a
@@ -31,7 +32,6 @@ libgrt_a_SOURCES = \
../../gettext-tools/lib/error.h ../../gettext-tools/lib/error.c \
../../gettext-tools/lib/exit.h \
../../gettext-tools/lib/fwriteerror.h ../../gettext-tools/lib/fwriteerror.c \
- ../../gettext-tools/lib/getopt.h ../../gettext-tools/lib/getopt.c ../../gettext-tools/lib/getopt1.c \
../../gettext-tools/lib/pathmax.h \
../../gettext-tools/lib/progname.h ../../gettext-tools/lib/progname.c ../../gettext-tools/lib/progreloc.c \
../../gettext-tools/lib/strtoul.c \
@@ -44,6 +44,7 @@ libgrt_a_SOURCES = \
LIBADD_SOURCE = \
atexit.c \
../../gettext-tools/lib/canonicalize.h canonicalize.c \
+ getopt.c getopt1.c ../../gettext-tools/lib/getopt_int.h \
memmove.c \
readlink.c \
../../gettext-tools/lib/relocatable.h relocatable.c \
@@ -91,6 +92,19 @@ MOSTLYCLEANFILES += alloca.h
# <<< gnulib module alloca.
+# >>> gnulib module getopt.
+BUILT_SOURCES += $(GETOPT_H)
+EXTRA_DIST += ../../gettext-tools/lib/getopt_.h ../../gettext-tools/lib/getopt_int.h
+
+# The following is needed in order to create a <getopt.h> when the system
+# doesn't have one that works.
+all-local $(libgettextlib_la_OBJECTS): @GETOPT_H@
+getopt.h: ../../gettext-tools/lib/getopt_.h
+ cp $(srcdir)/../../gettext-tools/lib/getopt_.h getopt.h
+MOSTLYCLEANFILES += getopt.h
+# <<< gnulib module getopt.
+
+
# VMS support.
EXTRA_DIST += Makefile.vms