annotate automake snippets with $(AM_V_GEN) and $(AM_V_at)

[pspp] / modules / sys_socket

diff --git a/modules/sys_socket b/modules/sys_socket
index 011fe69e73011c77d78b1030b7362b720d83ea02..58158d4d364514520246dd7570c6e559becc7396 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -10,6 +10,7 @@ Depends-on:
 include_next
 link-warning
 errno
+alignof
 
 configure.ac:
 gl_HEADER_SYS_SOCKET
@@ -21,7 +22,8 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 # We need the following in order to create <sys/socket.h> when the system
 # doesn't have one that works with the given compiler.
 sys/socket.h: sys_socket.in.h
-       @MKDIR_P@ sys
+       $(AM_V_at)@MKDIR_P@ sys
+       $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -44,9 +46,11 @@ sys/socket.h: sys_socket.in.h
              -e 's|@''GNULIB_SHUTDOWN''@|$(GNULIB_SHUTDOWN)|g' \
              -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
              -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
+             -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \
+             -e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              < $(srcdir)/sys_socket.in.h; \
-       } > $@-t
+       } > $@-t && \
        mv -f $@-t $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
 MOSTLYCLEANDIRS += sys