X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsys_ioctl;h=d5cf394476da94b32fe630110cd831f5e6e23bab;hb=116440ae18064c1495285a42767547b3ffa418d4;hp=f6f37930f01771cf02b2a21ed73a902b577424bc;hpb=f87db1aa7ec2bb87daba4a0dd09a2e733d313f81;p=gnulib.git

diff --git a/modules/sys_ioctl b/modules/sys_ioctl
index f6f37930f..d5cf39447 100644
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -7,19 +7,20 @@ m4/sys_ioctl_h.m4
 
 Depends-on:
 include_next
-link-warning
+c++defs
 unistd
+warn-on-use
 
 configure.ac:
 gl_SYS_IOCTL_H
 AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(SYS_IOCTL_H)
+BUILT_SOURCES += sys/ioctl.h
 
 # We need the following in order to create <sys/ioctl.h> when the system
 # does not have a complete one.
-sys/ioctl.h: sys_ioctl.in.h
+sys/ioctl.h: sys_ioctl.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
 	$(AM_V_at)$(MKDIR_P) sys
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -30,7 +31,8 @@ sys/ioctl.h: sys_ioctl.in.h
 	      -e 's|@''GNULIB_IOCTL''@|$(GNULIB_IOCTL)|g' \
 	      -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \
 	      -e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
-	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/sys_ioctl.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -38,7 +40,7 @@ MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t
 MOSTLYCLEANDIRS += sys
 
 Include:
-#include <sys/ioctl.h>
+<sys/ioctl.h>
 
 License:
 LGPLv2+