diff options
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/gnulib.mk | 62 | ||||
| -rw-r--r-- | gl/m4/gnulib-cache.m4 | 4 | ||||
| -rw-r--r-- | gl/m4/gnulib-comp.m4 | 12 |
3 files changed, 3 insertions, 75 deletions
diff --git a/gl/gnulib.mk b/gl/gnulib.mk index ac14a2de26..8afc347d8a 100644 --- a/gl/gnulib.mk +++ b/gl/gnulib.mk @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=malloc-posix --avoid=realloc-posix --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf MOSTLYCLEANFILES += core *.stackdump @@ -22,15 +22,6 @@ libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) EXTRA_libgnu_la_SOURCES = libgnu_la_LDFLAGS = $(AM_LDFLAGS) -## begin gnulib module absolute-header - -# Use this preprocessor expression to decide whether #include_next works. -# Do not rely on a 'configure'-time test for this, since the expression -# might appear in an installed header, which is used by some other compiler. -HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) - -## end gnulib module absolute-header - ## begin gnulib module arpa_inet BUILT_SOURCES += $(ARPA_INET_H) @@ -164,15 +155,6 @@ EXTRA_DIST += $(top_srcdir)/build-aux/GNUmakefile $(top_srcdir)/build-aux/maint. ## end gnulib module maintainer-makefile -## begin gnulib module malloc-posix - - -EXTRA_DIST += malloc.c - -EXTRA_libgnu_la_SOURCES += malloc.c - -## end gnulib module malloc-posix - ## begin gnulib module netinet_in BUILT_SOURCES += $(NETINET_IN_H) @@ -211,15 +193,6 @@ EXTRA_libgnu_la_SOURCES += readline.c ## end gnulib module readline -## begin gnulib module realloc-posix - - -EXTRA_DIST += realloc.c - -EXTRA_libgnu_la_SOURCES += realloc.c - -## end gnulib module realloc-posix - ## begin gnulib module stdbool BUILT_SOURCES += $(STDBOOL_H) @@ -295,39 +268,6 @@ EXTRA_DIST += stdio_.h ## end gnulib module stdio -## begin gnulib module stdlib - -BUILT_SOURCES += stdlib.h - -# We need the following in order to create <stdlib.h> when the system -# doesn't have one that works with the given compiler. -stdlib.h: stdlib_.h - rm -f $@-t $@ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ - -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \ - -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \ - -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ - -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ - -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ - -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \ - -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ - -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \ - -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ - -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \ - -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ - -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/stdlib_.h; \ - } > $@-t - mv $@-t $@ -MOSTLYCLEANFILES += stdlib.h stdlib.h-t - -EXTRA_DIST += stdlib_.h - -## end gnulib module stdlib - ## begin gnulib module strdup diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4 index 00da5468c4..7a32349ea3 100644 --- a/gl/m4/gnulib-cache.m4 +++ b/gl/m4/gnulib-cache.m4 @@ -15,12 +15,12 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf +# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --avoid=malloc-posix --avoid=realloc-posix --avoid=snprintf --avoid=vasnprintf --makefile-name=gnulib.mk --libtool --macro-prefix=gl arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gl/override]) gl_MODULES([arpa_inet error fdl gendocs getaddrinfo getline getpass gpl-2.0 inet_ntop inet_pton lgpl-2.1 maintainer-makefile progname readline version-etc-fsf]) -gl_AVOID([snprintf vasnprintf]) +gl_AVOID([malloc-posix realloc-posix snprintf vasnprintf]) gl_SOURCE_BASE([gl]) gl_M4_BASE([gl/m4]) gl_PO_BASE([]) diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 index 914e68f689..bbe54c1758 100644 --- a/gl/m4/gnulib-comp.m4 +++ b/gl/m4/gnulib-comp.m4 @@ -62,18 +62,13 @@ AC_DEFUN([gl_INIT], gl_INET_PTON gl_FUNC_LSEEK gl_UNISTD_MODULE_INDICATOR([lseek]) - gl_FUNC_MALLOC_POSIX - gl_STDLIB_MODULE_INDICATOR([malloc-posix]) gl_HEADER_NETINET_IN AC_PROG_MKDIR_P gl_FUNC_READLINE - gl_FUNC_REALLOC_POSIX - gl_STDLIB_MODULE_INDICATOR([realloc-posix]) gl_TYPE_SOCKLEN_T gl_STDARG_H AM_STDBOOL_H gl_STDIO_H - gl_STDLIB_H gl_FUNC_STRDUP gl_STRING_MODULE_INDICATOR([strdup]) gl_HEADER_STRING_H @@ -142,16 +137,13 @@ AC_DEFUN([gl_FILE_LIST], [ lib/inet_pton.c lib/inet_pton.h lib/lseek.c - lib/malloc.c lib/netinet_in_.h lib/progname.c lib/progname.h lib/readline.c lib/readline.h - lib/realloc.c lib/stdbool_.h lib/stdio_.h - lib/stdlib_.h lib/strdup.c lib/string_.h lib/sys_socket_.h @@ -159,7 +151,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/version-etc-fsf.c lib/version-etc.c lib/version-etc.h - m4/absolute-header.m4 m4/arpa_inet_h.m4 m4/error.m4 m4/extensions.m4 @@ -176,16 +167,13 @@ AC_DEFUN([gl_FILE_LIST], [ m4/lib-link.m4 m4/lib-prefix.m4 m4/lseek.m4 - m4/malloc.m4 m4/netinet_in_h.m4 m4/readline.m4 - m4/realloc.m4 m4/socklen.m4 m4/sockpfaf.m4 m4/stdarg.m4 m4/stdbool.m4 m4/stdio_h.m4 - m4/stdlib_h.m4 m4/strdup.m4 m4/string_h.m4 m4/sys_socket_h.m4 |