2004-07-11 Roland McGrath <roland@redhat.com>

	* configure.ac: Add I386 as AM_CONDITIONAL.
	* Makefile.am [LINUX]: Add maintainer-mode rules to regenerate
	the ioctlent.h file.

diff --git a/Makefile.am b/Makefile.am
index 5e5f4ae703c37858bc469e36fc340b2d921e5414..6612d2cd187ec219e6fef45dd6b3399f41d88686 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,3 +64,27 @@ EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
             sunos4/syscall.h sunos4/syscallent.h \
             svr4/dummy.h svr4/errnoent.h svr4/ioctlent.h svr4/ioctlent.sh \
             svr4/signalent.h svr4/syscall.h svr4/syscallent.h
+
+if MAINTAINER_MODE
+if LINUX
+
+IOCTLDIR = /usr/include
+
+if I386
+ioctlent_h = linux/ioctlent.h
+else
+ioctlent_h = linux/$(ARCH)/ioctlent.h
+endif
+
+BUILT_SOURCES = $(ioctlent_h)
+
+$(srcdir)/$(ioctlent_h): ioctlsort
+       $(<D)/$(<F) > $@
+ioctlsort: $(srcdir)/linux/ioctlsort.c ioctls.h ioctldefs.h
+       $(LINK.c) -I. -o $@ $<
+ioctls.h: $(srcdir)/linux/ioctlent.sh
+       $(SHELL) $< $(IOCTLDIR)
+ioctldefs.h: ioctls.h ;
+
+endif
+endif

diff --git a/configure.ac b/configure.ac
index d0f962cd56f4bede98cad2e1309d33159ad63e68..d7e176177e1f50abd31789e177c6cd70663921f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,7 @@ AC_SUBST(opsys)
 AC_SUBST(arch)
 
 AM_CONDITIONAL([LINUX], [test x$opsys = xlinux])
+AM_CONDITIONAL([I386], [test x$arch = xi386])
 AM_CONDITIONAL([X86_64], [test x$arch = xx86_64])
 AM_CONDITIONAL([SUNOS4], [test x$opsys = xsunos4])
 AM_CONDITIONAL([SVR4], [test x$opsys = xsvr4])