Project Info Name.......: gnu-hello
Description: GNU Hello


gnu-hello       
Info
Commit...:a4e423d9919fbf79fac472631a7e28c0e117ea85
Author...:karl <>
Committer:karl <>
Date.....:Tue Feb 14 18:54:04 2006 +0000
Parents..:e8dab6624fdd2c4a6a8bbb78fe026e5519ffa507

Message
[project @ 2006-02-14 18:54:04 by karl]
gnulib-tool --import

Changes
diff --git a/README.dev b/README.dev
line changes: +5/-1
index 973bf68..b9ef53a
--- a/README.dev
+++ b/README.dev
@@ -18,7 +18,11 @@ All of these programs are available from ftp://ftp.gnu.org/gnu.
 This distribution also uses Gnulib (http://www.gnu.org/software/gnulib)
 to share common files.  The files are checked in to CVS.  If you want to
 update from the current gnulib, do a cvs checkout of gnulib, and then
-run gnulib-tool --import in the top-level directory of hello.
+run
+  gnulib-tool --import
+in the top-level directory of hello.  First time invocation was
+  gnulib-tool --import --m4-base=gnulib/m4 --source-base=gnulib/lib
+Those settings are now kept in gnulib/m4/gnulib-cache.m4.
 
 After getting the CVS sources, and installing the tools above, you can run
   ./bootstrap

diff --git a/gnulib/lib/Makefile b/gnulib/lib/Makefile
line changes: +23/-30
index 99a2bd8..68d1d64
--- a/gnulib/lib/Makefile
+++ b/gnulib/lib/Makefile
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # gnulib/lib/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23,10 +23,8 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnulib --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux   getopt gettext
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl 
 
-SOURCES = $(libgnulib_a_SOURCES)
 
 srcdir = .
 top_srcdir = ../..
@@ -51,8 +49,8 @@ POST_UNINSTALL = :
 build_triplet = i686-pc-linux-gnu
 host_triplet = i686-pc-linux-gnu
 subdir = gnulib/lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in getopt.c \
-	getopt1.c
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in getopt.c getopt1.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/getopt.m4 \
 	$(top_srcdir)/gnulib/m4/gettext.m4 \
@@ -71,10 +69,10 @@ CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
-libgnulib_a_AR = $(AR) $(ARFLAGS)
-libgnulib_a_DEPENDENCIES = 
-am_libgnulib_a_OBJECTS =
-libgnulib_a_OBJECTS = $(am_libgnulib_a_OBJECTS)
+libgnu_a_AR = $(AR) $(ARFLAGS)
+libgnu_a_DEPENDENCIES = 
+am_libgnu_a_OBJECTS = dummy.$(OBJEXT)
+libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -82,8 +80,9 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libgnulib_a_SOURCES)
-DIST_SOURCES = $(libgnulib_a_SOURCES)
+SOURCES = $(libgnu_a_SOURCES)
+DIST_SOURCES = $(libgnu_a_SOURCES)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -185,13 +184,14 @@ sharedstatedir = ${prefix}/com
 sysconfdir = ${prefix}/etc
 target_alias = 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
-noinst_LIBRARIES = libgnulib.a
-libgnulib_a_SOURCES = gettext.h
-libgnulib_a_LIBADD = 
-EXTRA_DIST = getopt_.h getopt_int.h
-BUILT_SOURCES = $(GETOPT_H)
+noinst_LIBRARIES = libgnu.a
+libgnu_a_SOURCES = dummy.c
+libgnu_a_LIBADD = 
+noinst_HEADERS = 
+EXTRA_DIST = 
+BUILT_SOURCES = 
 SUFFIXES = 
-MOSTLYCLEANFILES = getopt.h getopt.h-t
+MOSTLYCLEANFILES = 
 CLEANFILES = 
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
@@ -232,10 +232,10 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libgnulib.a: $(libgnulib_a_OBJECTS) $(libgnulib_a_DEPENDENCIES) 
-	-rm -f libgnulib.a
-	$(libgnulib_a_AR) libgnulib.a $(libgnulib_a_OBJECTS) $(libgnulib_a_LIBADD)
-	$(RANLIB) libgnulib.a
+libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) 
+	-rm -f libgnu.a
+	$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD)
+	$(RANLIB) libgnu.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -328,7 +328,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LIBRARIES)
+all-am: Makefile $(LIBRARIES) $(HEADERS)
 installdirs:
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -419,13 +419,6 @@ uninstall-am: uninstall-info-am
 	uninstall-am uninstall-info-am
 
 
-# We need the following in order to create an <getopt.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(libgnulib_a_OBJECTS): $(GETOPT_H)
-getopt.h: getopt_.h
-	cp $(srcdir)/getopt_.h $@-t
-	mv $@-t $@
-
 # Makefile.am ends here
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
line changes: +8/-23
index fd9bac8..9606d13
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -8,15 +8,15 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnulib --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux   getopt gettext
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl 
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
-noinst_LIBRARIES = libgnulib.a
+noinst_LIBRARIES = libgnu.a
 
-libgnulib_a_SOURCES =
-libgnulib_a_LIBADD = @LIBOBJS@
+libgnu_a_SOURCES =
+libgnu_a_LIBADD = @LIBOBJS@
+noinst_HEADERS =
 EXTRA_DIST =
 BUILT_SOURCES =
 SUFFIXES =
@@ -25,26 +25,11 @@ CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 
-## begin gnulib module getopt
+## begin gnulib module dummy
 
-BUILT_SOURCES += $(GETOPT_H)
-EXTRA_DIST += getopt_.h getopt_int.h
+libgnu_a_SOURCES += dummy.c
 
-# We need the following in order to create an <getopt.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(libgnulib_a_OBJECTS): $(GETOPT_H)
-getopt.h: getopt_.h
-	cp $(srcdir)/getopt_.h $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += getopt.h getopt.h-t
-
-## end   gnulib module getopt
-
-## begin gnulib module gettext
-
-libgnulib_a_SOURCES += gettext.h
-
-## end   gnulib module gettext
+## end   gnulib module dummy
 
 
 # Makefile.am ends here

diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
line changes: +23/-30
index 74ef244..a649ad8
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23,10 +23,8 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnulib --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux   getopt gettext
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl 
 
-SOURCES = $(libgnulib_a_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -51,8 +49,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = gnulib/lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in getopt.c \
-	getopt1.c
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in getopt.c getopt1.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/getopt.m4 \
 	$(top_srcdir)/gnulib/m4/gettext.m4 \
@@ -71,10 +69,10 @@ CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
-libgnulib_a_AR = $(AR) $(ARFLAGS)
-libgnulib_a_DEPENDENCIES = @LIBOBJS@
-am_libgnulib_a_OBJECTS =
-libgnulib_a_OBJECTS = $(am_libgnulib_a_OBJECTS)
+libgnu_a_AR = $(AR) $(ARFLAGS)
+libgnu_a_DEPENDENCIES = @LIBOBJS@
+am_libgnu_a_OBJECTS = dummy.$(OBJEXT)
+libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -82,8 +80,9 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libgnulib_a_SOURCES)
-DIST_SOURCES = $(libgnulib_a_SOURCES)
+SOURCES = $(libgnu_a_SOURCES)
+DIST_SOURCES = $(libgnu_a_SOURCES)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -185,13 +184,14 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
-noinst_LIBRARIES = libgnulib.a
-libgnulib_a_SOURCES = gettext.h
-libgnulib_a_LIBADD = @LIBOBJS@
-EXTRA_DIST = getopt_.h getopt_int.h
-BUILT_SOURCES = $(GETOPT_H)
+noinst_LIBRARIES = libgnu.a
+libgnu_a_SOURCES = dummy.c
+libgnu_a_LIBADD = @LIBOBJS@
+noinst_HEADERS = 
+EXTRA_DIST = 
+BUILT_SOURCES = 
 SUFFIXES = 
-MOSTLYCLEANFILES = getopt.h getopt.h-t
+MOSTLYCLEANFILES = 
 CLEANFILES = 
 DISTCLEANFILES = 
 MAINTAINERCLEANFILES = 
@@ -232,10 +232,10 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libgnulib.a: $(libgnulib_a_OBJECTS) $(libgnulib_a_DEPENDENCIES) 
-	-rm -f libgnulib.a
-	$(libgnulib_a_AR) libgnulib.a $(libgnulib_a_OBJECTS) $(libgnulib_a_LIBADD)
-	$(RANLIB) libgnulib.a
+libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) 
+	-rm -f libgnu.a
+	$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD)
+	$(RANLIB) libgnu.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -328,7 +328,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LIBRARIES)
+all-am: Makefile $(LIBRARIES) $(HEADERS)
 installdirs:
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -419,13 +419,6 @@ uninstall-am: uninstall-info-am
 	uninstall-am uninstall-info-am
 
 
-# We need the following in order to create an <getopt.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(libgnulib_a_OBJECTS): $(GETOPT_H)
-getopt.h: getopt_.h
-	cp $(srcdir)/getopt_.h $@-t
-	mv $@-t $@
-
 # Makefile.am ends here
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/gnulib/lib/dummy.c b/gnulib/lib/dummy.c
line changes: +30/-0
index 0000000..024d064
--- /dev/null
+++ b/gnulib/lib/dummy.c
@@ -0,0 +1,30 @@
+/* A dummy file, to prevent empty libraries from breaking builds.
+   Copyright (C) 2004 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
+   libraries without any object files.  You might get an error like:
+
+   > ar cru .libs/libgl.a
+   > ar: no archive members specified
+
+   Compiling this file, and adding its object file to the library, will
+   prevent the library from being empty.  */
+
+/* This declaration is solely to ensure that after preprocessing
+   this file is never empty.  */
+typedef int dummy;

diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4
line changes: +26/-0
index 0000000..a490a5a
--- /dev/null
+++ b/gnulib/m4/gnulib-cache.m4
@@ -0,0 +1,26 @@
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the specification of how gnulib-tool is used.
+# It acts as a cache: It is written and read by gnulib-tool.
+# In projects using CVS, this file is meant to be stored in CVS,
+# like the configure.ac and various Makefile.am files.
+
+
+# Specification in the form of a command-line invocation:
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl 
+
+# Specification in the form of a few gnulib-tool.m4 macro invocations:
+gl_MODULES([])
+gl_AVOID([])
+gl_SOURCE_BASE([gnulib/lib])
+gl_M4_BASE([gnulib/m4])
+gl_TESTS_BASE([tests])
+gl_LIB([libgnu])
+gl_MACRO_PREFIX([gl])

diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4
line changes: +36/-0
index 0000000..41424b5
--- /dev/null
+++ b/gnulib/m4/gnulib-comp.m4
@@ -0,0 +1,36 @@
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+#
+# This file represents the compiled summary of the specification in
+# gnulib-cache.m4. It lists the computed macro invocations that need
+# to be invoked from configure.ac.
+# In projects using CVS, this file can be treated like other built files.
+
+
+# This macro should be invoked from ./configure.ac, in the section
+# "Checks for programs", right after AC_PROG_CC, and certainly before
+# any checks for libraries, header files, types and library functions.
+AC_DEFUN([gl_EARLY],
+[
+  AC_REQUIRE([AC_PROG_RANLIB])
+])
+
+# This macro should be invoked from ./configure.ac, in the section
+# "Check for header files, types and library functions".
+AC_DEFUN([gl_INIT],
+[
+  AM_CONDITIONAL([GL_COND_LIBTOOL], [false])
+])
+
+# This macro records the list of files which have been installed by
+# gnulib-tool and may be removed by future gnulib-tool invocations.
+AC_DEFUN([gl_FILE_LIST], [
+  lib/dummy.c
+  m4/onceonly_2_57.m4
+])

diff --git a/gnulib/m4/gnulib-tool.m4 b/gnulib/m4/gnulib-tool.m4
line changes: +33/-0
index 0000000..ef59320
--- /dev/null
+++ b/gnulib/m4/gnulib-tool.m4
@@ -0,0 +1,33 @@
+# gnulib-tool.m4 serial 1
+dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl The following macros need not be invoked explicitly.
+dnl Invoking them does nothing except to declare default arguments
+dnl for "gnulib-tool --import".
+
+dnl Usage: gl_MODULES([module1 module2 ...])
+AC_DEFUN([gl_MODULES], [])
+
+dnl Usage: gl_AVOID([module1 module2 ...])
+AC_DEFUN([gl_AVOID], [])
+
+dnl Usage: gl_SOURCE_BASE([DIR])
+AC_DEFUN([gl_SOURCE_BASE], [])
+
+dnl Usage: gl_M4_BASE([DIR])
+AC_DEFUN([gl_M4_BASE], [])
+
+dnl Usage: gl_LIB([LIBNAME])
+AC_DEFUN([gl_LIB], [])
+
+dnl Usage: gl_LGPL
+AC_DEFUN([gl_LGPL], [])
+
+dnl Usage: gl_LIBTOOL
+AC_DEFUN([gl_LIBTOOL], [])
+
+dnl Usage: gl_MACRO_PREFIX([PREFIX])
+AC_DEFUN([gl_MACRO_PREFIX], [])

diff --git a/gnulib/m4/onceonly_2_57.m4 b/gnulib/m4/onceonly_2_57.m4
line changes: +2/-2
index 9fc510e..14d3c0b
--- a/gnulib/m4/onceonly_2_57.m4
+++ b/gnulib/m4/onceonly_2_57.m4
@@ -1,5 +1,5 @@
 # onceonly_2_57.m4 serial 3
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -27,7 +27,7 @@ dnl thus reducing the size of 'configure'. Works with autoconf-2.57. The
 dnl size reduction is ca. 9%.
 
 dnl Autoconf version 2.57 or newer is recommended.
-AC_PREREQ(2.54)
+AC_PREREQ(2.57)
 
 # AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
 # AC_CHECK_HEADERS(HEADER1 HEADER2 ...).

This website is licensed under AGPL-3.0. Feel free to copy!