From: Roland McGrath <roland@redhat.com>
Date: Mon, 30 Dec 2002 01:11:08 +0000 (+0000)
Subject: 2002-12-29  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~914
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80964aaf26efc18a035a382e53beb4166b6611ac;p=strace

2002-12-29  Roland McGrath  <roland@redhat.com>

	* configure.ac, Makefile.am: Punt subdirs, handle everything here.
---

diff --git a/Makefile.am b/Makefile.am
index 8a768003..c61ccca3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,17 +7,26 @@ man_MANS = strace.1
 OS		= @opsys@
 # ARCH is `i386', `m68k', `sparc', etc.
 ARCH		= @arch@
-# OSARCH is OS/ARCH if a makefile exists there, otherwise just OS.
-OSARCH		= @osarch@
 
 INCLUDES = -I$(OS)/$(ARCH) -I$(srcdir)/$(OS)/$(ARCH) -I$(OS) -I$(srcdir)/$(OS)
 
-SUBDIRS = $(OSARCH)
-DIST_SUBDIRS = test freebsd/i386 sunos4 svr4 linux
-
 strace_SOURCES = strace.c version.c syscall.c util.c desc.c file.c ipc.c \
 		 io.c ioctl.c mem.c net.c process.c bjm.c \
 		 resource.c signal.c sock.c system.c term.c time.c \
 		 proc.c stream.c
 
-EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c
+EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
+	     linux/ioctlsort.c \
+	     linux/ioctlent.h linux/errnoent.h linux/signalent.h \
+	     linux/syscall.h linux/syscallent.h linux/dummy.h \
+	     linux/*/errnoent.h linux/*/ioctlent.h \
+	     linux/*/signalent.h linux/*/syscallent.h \
+	     freebsd/ioctlent.sh \
+	     freebsd/syscalls.cat freebsd/syscalls.pl freebsd/syscalls.print \
+	     freebsd/*/errnoent.h freebsd/*/ioctlent.h \
+	     freebsd/*/signalent.h freebsd/*/syscall.h freebsd/*/syscallent.h
+	     sunos4/dummy.h sunos4/errnoent.h \
+	     sunos4/ioctlent.h sunos4/ioctlent.sh sunos4/signalent.h \
+	     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
diff --git a/configure.ac b/configure.ac
index a0d12a78..5fda9fc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,10 +12,12 @@ case "$host_os" in
 linux*)
 	opsys=linux
 	AC_DEFINE([LINUX], 1, [Define for the Linux operating system.])
+	AM_CONDITIONAL([LINUX], [test x$opsys = xlinux])
 	;;
 sunos4*)
 	opsys=sunos4
 	AC_DEFINE([SUNOS4], 1, [Define for the SunOS 4.x operating system.])
+	AM_CONDITIONAL([SUNOS4], [test x$opsys = xsunos4])
 	;;
 solaris2* | sysv[[45]]* | irix[[56]]*)
 	opsys=svr4
@@ -29,10 +31,12 @@ system or a derivative like Solaris 2.x or Irix 5.x.])
 		AC_DEFINE(UNIXWARE, 7, [Define for UnixWare systems.])
 		;;
 	esac
+	AM_CONDITIONAL([SVR4], [test x$opsys = xsvr4])
 	;;
 freebsd*)
 	opsys=freebsd
 	AC_DEFINE([FREEBSD], 1, [Define for the FreeBSD operating system.])
+	AM_CONDITIONAL([FREEBSD], [test x$opsys = xfreebsd])
 	;;
 *)
 	AC_MSG_RESULT([NO!])
@@ -102,14 +106,8 @@ x86?64*)
 esac
 AC_MSG_RESULT($arch)
 
-osarch="$opsys"
-if test -r "$srcdir/$opsys/$arch/Makefile.in"; then
-	osarch="$opsys/$arch"
-fi
-
 AC_SUBST(opsys)
 AC_SUBST(arch)
-AC_SUBST(osarch)
 
 CFLAGS="-D_GNU_SOURCE $CFLAGS"
 AC_PROG_CC
@@ -194,5 +192,5 @@ AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include <signal.h>])
 
 AC_PATH_PROG([PERL], [perl])
 
-AC_CONFIG_FILES([Makefile $osarch/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT