diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-06-26 09:56:47 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-06-26 09:56:47 +0200 |
| commit | a2169b0b7b255e656e3fea4c48d34ba1b3acbbc1 (patch) | |
| tree | 6c9b74ca679fdaa26992ec06c90a6a45e01cb49b /gl/gnulib.mk | |
| parent | fdb5649249bda069648369df6eb264737768fa74 (diff) | |
| download | gnutls-a2169b0b7b255e656e3fea4c48d34ba1b3acbbc1.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl/gnulib.mk')
| -rw-r--r-- | gl/gnulib.mk | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/gl/gnulib.mk b/gl/gnulib.mk index 47c97abb68..86d1f3e8ea 100644 --- a/gl/gnulib.mk +++ b/gl/gnulib.mk @@ -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) @@ -125,8 +116,8 @@ netinet/in.h: @MKDIR_P@ netinet rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_NETINET_IN_H''@|$(ABSOLUTE_NETINET_IN_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \ < $(srcdir)/netinet_in_.h; \ } > $@-t @@ -189,8 +180,8 @@ BUILT_SOURCES += string.h string.h: string_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_STRING_H''@|$(ABSOLUTE_STRING_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \ -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \ @@ -253,8 +244,8 @@ BUILT_SOURCES += $(SYS_SOCKET_H) sys/socket.h: sys_socket_.h @MKDIR_P@ sys { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_SYS_SOCKET_H''@|$(ABSOLUTE_SYS_SOCKET_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ @@ -286,4 +277,5 @@ mostlyclean-local: mostlyclean-generic if test -n "$$dir" && test -d $$dir; then \ echo "rmdir $$dir"; rmdir $$dir; \ fi; \ - done + done; \ + : |