configure: Move target source selection into configure.host
authorRichard Henderson <rth@twiddle.net>
Thu, 13 Nov 2014 12:50:39 +0000 (13:50 +0100)
committerRichard Henderson <rth@twiddle.net>
Fri, 14 Nov 2014 12:06:12 +0000 (13:06 +0100)
This eliminates the AM_CONDITIONAL ugliness, which eliminates
just a bit of extra boilerplate for a new target.

At the same time, properly categorize the EXTRA_DIST files
into SOURCES and HEADERS, for the generation of ctags.

Makefile.am
configure.ac
configure.host
include/Makefile.am

index 7766e90..dfdcea6 100644 (file)
@@ -7,51 +7,13 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = include testsuite man
 
 EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj                     \
-        src/aarch64/ffi.c src/aarch64/ffitarget.h src/aarch64/sysv.S   \
-        src/alpha/ffi.c src/alpha/osf.S                        \
-        src/alpha/ffitarget.h src/arc/ffi.c src/arc/arcompact.S        \
-        src/arc/ffitarget.h src/arm/ffi.c src/arm/sysv.S               \
-        src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S           \
-        src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S           \
-        src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h       \
-        src/ia64/ia64_flags.h src/ia64/unix.S src/mips/ffi.c           \
-        src/mips/n32.S src/mips/o32.S src/metag/ffi.c                  \
-        src/metag/ffitarget.h src/metag/sysv.S src/moxie/ffi.c         \
-        src/moxie/ffitarget.h src/moxie/eabi.S src/mips/ffitarget.h    \
-        src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h            \
-        src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h            \
-        src/m88k/ffi.c src/m88k/obsd.S src/m88k/ffitarget.h            \
-        src/microblaze/ffi.c src/microblaze/sysv.S                     \
-        src/microblaze/ffitarget.h                                     \
-        src/nios2/ffi.c src/nios2/ffitarget.h src/nios2/sysv.S         \
-        src/or1k/ffi.c src/or1k/ffitarget.h src/or1k/sysv.S            \
-        src/powerpc/ffi.c src/powerpc/ffi_powerpc.h                    \
-        src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c               \
-        src/powerpc/sysv.S src/powerpc/linux64.S                       \
-        src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S        \
-        src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S       \
-        src/powerpc/aix_closure.S src/powerpc/darwin_closure.S         \
-        src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h               \
-        src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h            \
-        src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/sh64/ffi.c   \
-        src/sh64/sysv.S src/sh64/ffitarget.h src/sparc/v8.S            \
-        src/sparc/v9.S src/sparc/ffitarget.h src/sparc/ffi.c           \
-        src/sparc/ffi64.c src/x86/darwin64.S src/x86/ffi.c src/x86/sysv.S \
-        src/x86/darwin.S src/x86/ffiw64.c src/x86/win64.S              \
-        src/x86/ffi64.c src/x86/unix64.S                               \
-        src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c            \
-        src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/bfin/ffi.c    \
-        src/bfin/ffitarget.h src/bfin/sysv.S src/frv/eabi.S            \
-        src/frv/ffitarget.h src/dlmalloc.c src/tile/ffi.c              \
-        src/tile/ffitarget.h src/tile/tile.S libtool-version           \
-        src/vax/ffi.c src/vax/ffitarget.h src/vax/elfbsd.S             \
-        src/xtensa/ffitarget.h src/xtensa/ffi.c src/xtensa/sysv.S      \
-        ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4               \
+       ChangeLog.libffi ChangeLog.libffi-3.1                           \
+       m4/libtool.m4 m4/lt~obsolete.m4                                 \
         m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4                  \
         m4/ltversion.m4 src/debug.c msvcc.sh                           \
-        generate-darwin-source-and-headers.py                          \
-        libffi.xcodeproj/project.pbxproj                               \
-        libtool-ldflags ChangeLog.libffi-3.1
+       generate-darwin-source-and-headers.py                           \
+       libffi.xcodeproj/project.pbxproj                                \
+       libtool-ldflags
 
 info_TEXINFOS = doc/libffi.texi
 
@@ -104,134 +66,95 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 
 MAKEOVERRIDES=
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libffi.pc
+
 toolexeclib_LTLIBRARIES = libffi.la
 noinst_LTLIBRARIES = libffi_convenience.la
 
 libffi_la_SOURCES = src/prep_cif.c src/types.c \
                src/raw_api.c src/java_raw_api.c src/closures.c
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libffi.pc
-
-nodist_libffi_la_SOURCES =
-
 if FFI_DEBUG
-nodist_libffi_la_SOURCES += src/debug.c
-endif
+libffi_la_SOURCES += src/debug.c
+endif
+
+noinst_HEADERS = \
+       src/aarch64/ffitarget.h src/aarch64/internal.h                  \
+       src/alpha/ffitarget.h src/alpha/internal.h                      \
+       src/arc/ffitarget.h                                             \
+       src/arm/ffitarget.h src/arm/internal.h                          \
+       src/avr32/ffitarget.h                                           \
+       src/bfin/ffitarget.h                                            \
+       src/cris/ffitarget.h                                            \
+       src/frv/ffitarget.h                                             \
+       src/ia64/ffitarget.h src/ia64/ia64_flags.h                      \
+       src/m32r/ffitarget.h                                            \
+       src/m68k/ffitarget.h                                            \
+       src/m88k/ffitarget.h                                            \
+       src/metag/ffitarget.h                                           \
+       src/microblaze/ffitarget.h                                      \
+       src/mips/ffitarget.h                                            \
+       src/moxie/ffitarget.h                                           \
+       src/nios2/ffitarget.h                                           \
+       src/or1k/ffitarget.h                                            \
+       src/pa/ffitarget.h                                              \
+       src/powerpc/ffitarget.h src/powerpc/asm.h src/powerpc/ffi_powerpc.h \
+       src/s390/ffitarget.h                                            \
+       src/sh/ffitarget.h                                              \
+       src/sh64/ffitarget.h                                            \
+       src/sparc/ffitarget.h src/sparc/internal.h                      \
+       src/tile/ffitarget.h                                            \
+       src/vax/ffitarget.h                                             \
+       src/x86/ffitarget.h src/x86/internal.h src/x86/internal64.h     \
+       src/xtensa/ffitarget.h                                          \
+       src/dlmalloc.c
+
+EXTRA_libffi_la_SOURCES = \
+       src/aarch64/ffi.c src/aarch64/sysv.S                            \
+       src/alpha/ffi.c src/alpha/osf.S                                 \
+       src/arc/ffi.c src/arc/arcompact.S                               \
+       src/arm/ffi.c src/arm/sysv.S                                    \
+       src/avr32/ffi.c src/avr32/sysv.S                                \
+       src/bfin/ffi.c src/bfin/sysv.S                                  \
+       src/cris/ffi.c src/cris/sysv.S                                  \
+       src/frv/ffi.c src/frv/eabi.S                                    \
+       src/ia64/ffi.c src/ia64/unix.S                                  \
+       src/m32r/ffi.c src/m32r/sysv.S                                  \
+       src/m68k/ffi.c src/m68k/sysv.S                                  \
+       src/m88k/ffi.c src/m88k/obsd.S                                  \
+       src/metag/ffi.c src/metag/sysv.S                                \
+       src/microblaze/ffi.c src/microblaze/sysv.S                      \
+       src/mips/ffi.c src/mips/o32.S src/mips/n32.S                    \
+       src/moxie/ffi.c src/moxie/eabi.S                                \
+       src/nios2/ffi.c src/nios2/sysv.S                                \
+       src/or1k/ffi.c src/or1k/sysv.S                                  \
+       src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S                     \
+       src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c \
+        src/powerpc/sysv.S src/powerpc/linux64.S                       \
+        src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S        \
+        src/powerpc/aix.S src/powerpc/darwin.S src/powerpc/aix_closure.S \
+        src/powerpc/darwin_closure.S src/powerpc/ffi_darwin.c          \
+       src/s390/ffi.c src/s390/sysv.S                                  \
+       src/sh/ffi.c src/sh/sysv.S                                      \
+       src/sh64/ffi.c src/sh64/sysv.S                                  \
+       src/sparc/ffi.c src/sparc/ffi64.c src/sparc/v8.S src/sparc/v9.S \
+       src/tile/ffi.c src/tile/tile.S                                  \
+       src/vax/ffi.c src/vax/elfbsd.S                                  \
+       src/x86/ffi.c src/x86/sysv.S                                    \
+        src/x86/ffiw64.c src/x86/win64.S                               \
+        src/x86/ffi64.c src/x86/unix64.S                               \
+        src/x86/darwin64.S src/x86/darwin.S                            \
+       src/xtensa/ffi.c src/xtensa/sysv.S
 
-if MIPS
-nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
-endif
-if BFIN
-nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
-endif
-if X86
-nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
-endif
-if X86_FREEBSD
-nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
-endif
-if X86_WIN32
-nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
-endif
-if X86_WIN64
-nodist_libffi_la_SOURCES += src/x86/ffiw64.c src/x86/win64.S
-endif
-if X86_DARWIN
-nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
-endif
-if SPARC
-nodist_libffi_la_SOURCES += src/sparc/ffi.c src/sparc/ffi64.c src/sparc/v8.S src/sparc/v9.S
-endif
-if ALPHA
-nodist_libffi_la_SOURCES += src/alpha/ffi.c src/alpha/osf.S
-endif
-if IA64
-nodist_libffi_la_SOURCES += src/ia64/ffi.c src/ia64/unix.S
-endif
-if M32R
-nodist_libffi_la_SOURCES += src/m32r/sysv.S src/m32r/ffi.c
-endif
-if M68K
-nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S
-endif
-if M88K
-nodist_libffi_la_SOURCES += src/m88k/ffi.c src/m88k/obsd.S
-endif
-if MOXIE
-nodist_libffi_la_SOURCES += src/moxie/ffi.c src/moxie/eabi.S
-endif
-if MICROBLAZE
-nodist_libffi_la_SOURCES += src/microblaze/ffi.c src/microblaze/sysv.S
-endif
-if NIOS2
-nodist_libffi_la_SOURCES += src/nios2/sysv.S src/nios2/ffi.c
-endif
-if OR1K
-nodist_libffi_la_SOURCES += src/or1k/sysv.S src/or1k/ffi.c
-endif
-if POWERPC
-nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/ffi_linux64.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
-endif
-if POWERPC_AIX
-nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
-endif
-if POWERPC_DARWIN
-nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
-endif
-if POWERPC_FREEBSD
-nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/ffi_sysv.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
-endif
-if AARCH64
-nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
-endif
-if ARC
-nodist_libffi_la_SOURCES += src/arc/arcompact.S src/arc/ffi.c
-endif
-if ARM
-nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
-endif
-if AVR32
-nodist_libffi_la_SOURCES += src/avr32/sysv.S src/avr32/ffi.c
-endif
-if LIBFFI_CRIS
-nodist_libffi_la_SOURCES += src/cris/sysv.S src/cris/ffi.c
-endif
-if FRV
-nodist_libffi_la_SOURCES += src/frv/eabi.S src/frv/ffi.c
-endif
-if S390
-nodist_libffi_la_SOURCES += src/s390/sysv.S src/s390/ffi.c
-endif
-if X86_64
-nodist_libffi_la_SOURCES += src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
-endif
-if SH
-nodist_libffi_la_SOURCES += src/sh/sysv.S src/sh/ffi.c
-endif
-if SH64
-nodist_libffi_la_SOURCES += src/sh64/sysv.S src/sh64/ffi.c
-endif
-if PA_LINUX
-nodist_libffi_la_SOURCES += src/pa/linux.S src/pa/ffi.c
-endif
-if PA_HPUX
-nodist_libffi_la_SOURCES += src/pa/hpux32.S src/pa/ffi.c
-endif
-if TILE
-nodist_libffi_la_SOURCES += src/tile/tile.S src/tile/ffi.c
-endif
-if XTENSA
-nodist_libffi_la_SOURCES += src/xtensa/sysv.S src/xtensa/ffi.c
-endif
-if METAG
-nodist_libffi_la_SOURCES += src/metag/sysv.S src/metag/ffi.c
-endif
-if VAX
-nodist_libffi_la_SOURCES += src/vax/elfbsd.S src/vax/ffi.c
-endif
+TARGET_OBJ = @TARGET_OBJ@
+libffi_la_LIBADD = $(TARGET_OBJ)
+libffi_la_DEPENDENCIES = $(TARGET_OBJ)
 
 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
+EXTRA_libffi_convenience_la_SOURCES = $(EXTRA_libffi_la_SOURCES)
+libffi_convenience_la_LIBADD = $(libffi_la_LIBADD)
+libffi_convenience_la_DEPENDENCIES = $(libffi_la_DEPENDENCIES)
 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
 
 LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/libtool-ldflags $(LDFLAGS))
index 66e07ae..d5414f9 100644 (file)
@@ -75,53 +75,12 @@ HAVE_LONG_DOUBLE_VARIANT=0
 
 . ${srcdir}/configure.host
 
-AC_SUBST(AM_RUNTESTFLAGS)
-AC_SUBST(AM_LTLDFLAGS)
-
-if test $TARGETDIR = unknown; then
+if test -n "${UNSUPPORTED}"; then
   AC_MSG_ERROR(["libffi has not been ported to $host."])
 fi
 
-AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
-AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN)
-AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
-AM_CONDITIONAL(X86, test x$TARGET = xX86)
-AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
-AM_CONDITIONAL(X86_WIN32, test x$TARGET = xX86_WIN32)
-AM_CONDITIONAL(X86_WIN64, test x$TARGET = xX86_WIN64)
-AM_CONDITIONAL(X86_DARWIN, test x$TARGET = xX86_DARWIN)
-AM_CONDITIONAL(X86_DARWIN32, test x$TARGET = xX86_DARWIN && test $ac_cv_sizeof_size_t = 4)
-AM_CONDITIONAL(X86_DARWIN64, test x$TARGET = xX86_DARWIN && test $ac_cv_sizeof_size_t = 8)
-AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
-AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
-AM_CONDITIONAL(M32R, test x$TARGET = xM32R)
-AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
-AM_CONDITIONAL(M88K, test x$TARGET = xM88K)
-AM_CONDITIONAL(MICROBLAZE, test x$TARGET = xMICROBLAZE)
-AM_CONDITIONAL(METAG, test x$TARGET = xMETAG)
-AM_CONDITIONAL(MOXIE, test x$TARGET = xMOXIE)
-AM_CONDITIONAL(NIOS2, test x$TARGET = xNIOS2)
-AM_CONDITIONAL(OR1K, test x$TARGET = xOR1K)
-AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
-AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX)
-AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
-AM_CONDITIONAL(POWERPC_FREEBSD, test x$TARGET = xPOWERPC_FREEBSD)
-AM_CONDITIONAL(AARCH64, test x$TARGET = xAARCH64)
-AM_CONDITIONAL(ARC, test x$TARGET = xARC)
-AM_CONDITIONAL(ARM, test x$TARGET = xARM)
-AM_CONDITIONAL(AVR32, test x$TARGET = xAVR32)
-AM_CONDITIONAL(LIBFFI_CRIS, test x$TARGET = xLIBFFI_CRIS)
-AM_CONDITIONAL(FRV, test x$TARGET = xFRV)
-AM_CONDITIONAL(S390, test x$TARGET = xS390)
-AM_CONDITIONAL(X86_64, test x$TARGET = xX86_64)
-AM_CONDITIONAL(SH, test x$TARGET = xSH)
-AM_CONDITIONAL(SH64, test x$TARGET = xSH64)
-AM_CONDITIONAL(PA_LINUX, test x$TARGET = xPA_LINUX)
-AM_CONDITIONAL(PA_HPUX, test x$TARGET = xPA_HPUX)
-AM_CONDITIONAL(PA64_HPUX, test x$TARGET = xPA64_HPUX)
-AM_CONDITIONAL(TILE, test x$TARGET = xTILE)
-AM_CONDITIONAL(VAX, test x$TARGET = xVAX)
-AM_CONDITIONAL(XTENSA, test x$TARGET = xXTENSA)
+AC_SUBST(AM_RUNTESTFLAGS)
+AC_SUBST(AM_LTLDFLAGS)
 
 AC_HEADER_STDC
 AC_CHECK_FUNCS(memcpy)
@@ -347,6 +306,14 @@ AH_BOTTOM([
 AC_SUBST(TARGET)
 AC_SUBST(TARGETDIR)
 
+changequote(<,>)
+TARGET_OBJ=
+for i in $SOURCES; do
+  TARGET_OBJ="${TARGET_OBJ} src/${TARGETDIR}/"`echo $i | sed 's/[cS]$/lo/'`
+done
+changequote([,])
+AC_SUBST(TARGET_OBJ)
+
 AC_SUBST(SHELL)
 
 AC_ARG_ENABLE(debug,
index e6e3558..bc3e838 100644 (file)
@@ -4,49 +4,60 @@
 #
 
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
+# Most of the time we can define all the variables all at once...
 case "${host}" in
   aarch64*-*-*)
        TARGET=AARCH64; TARGETDIR=aarch64
+       SOURCES="ffi.c sysv.S"
        ;;
 
   alpha*-*-*)
        TARGET=ALPHA; TARGETDIR=alpha;
        # Support 128-bit long double, changeable via command-line switch.
        HAVE_LONG_DOUBLE='defined(__LONG_DOUBLE_128__)'
+       SOURCES="ffi.c osf.S"
        ;;
 
   arc*-*-*)
        TARGET=ARC; TARGETDIR=arc
+       SOURCES="ffi.c arcompact.S"
        ;;
 
   arm*-*-*)
        TARGET=ARM; TARGETDIR=arm
+       SOURCES="ffi.c sysv.S"
        ;;
 
   avr32*-*-*)
        TARGET=AVR32; TARGETDIR=avr32
+       SOURCES="ffi.c sysv.S"
        ;;
 
   bfin*)
        TARGET=BFIN; TARGETDIR=bfin
+       SOURCES="ffi.c sysv.S"
        ;;
 
   cris-*-*)
        TARGET=LIBFFI_CRIS; TARGETDIR=cris
+       SOURCES="ffi.c sysv.S"
        ;;
 
   frv-*-*)
        TARGET=FRV; TARGETDIR=frv
+       SOURCES="ffi.c eabi.S"
        ;;
 
   hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*)
        TARGET=PA_LINUX; TARGETDIR=pa
+       SOURCES="ffi.c linux.S"
        ;;
   hppa*64-*-hpux*)
        TARGET=PA64_HPUX; TARGETDIR=pa
        ;;
   hppa*-*-hpux*)
        TARGET=PA_HPUX; TARGETDIR=pa
+       SOURCES="ffi.c hpux32.S"
        ;;
 
   i?86-*-freebsd* | i?86-*-openbsd*)
@@ -94,30 +105,37 @@ case "${host}" in
 
   ia64*-*-*)
        TARGET=IA64; TARGETDIR=ia64
+       SOURCES="ffi.c unix.S"
        ;;
 
   m32r*-*-*)
        TARGET=M32R; TARGETDIR=m32r
+       SOURCES="ffi.c sysv.S"
        ;;
 
   m68k-*-*)
        TARGET=M68K; TARGETDIR=m68k
+       SOURCES="ffi.c sysv.S"
        ;;
 
   m88k-*-*)
        TARGET=M88K; TARGETDIR=m88k
+       SOURCES="ffi.c obsd.S"
        ;;
 
   microblaze*-*-*)
        TARGET=MICROBLAZE; TARGETDIR=microblaze
+       SOURCES="ffi.c sysv.S"
        ;;
 
   moxie-*-*)
        TARGET=MOXIE; TARGETDIR=moxie
+       SOURCES="ffi.c eabi.S"
        ;;
 
   metag-*-*)
        TARGET=METAG; TARGETDIR=metag
+       SOURCES="ffi.c sysv.S"
        ;;
 
   mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
@@ -131,10 +149,12 @@ case "${host}" in
 
   nios2*-linux*)
        TARGET=NIOS2; TARGETDIR=nios2
+       SOURCES="ffi.c sysv.S"
        ;;
 
   or1k*-linux*)
        TARGET=OR1K; TARGETDIR=or1k
+       SOURCES="ffi.c sysv.S"
        ;;
 
   powerpc*-*-linux* | powerpc-*-sysv*)
@@ -166,28 +186,72 @@ case "${host}" in
 
   s390-*-* | s390x-*-*)
        TARGET=S390; TARGETDIR=s390
+       SOURCES="ffi.c sysv.S"
        ;;
 
   sh-*-* | sh[[34]]*-*-*)
        TARGET=SH; TARGETDIR=sh
+       SOURCES="ffi.c sysv.S"
        ;;
   sh64-*-* | sh5*-*-*)
        TARGET=SH64; TARGETDIR=sh64
+       SOURCES="ffi.c sysv.S"
        ;;
 
   sparc*-*-*)
        TARGET=SPARC; TARGETDIR=sparc
+       SOURCES="ffi.c ffi64.c v8.S v9.S"
        ;;
 
   tile*-*)
         TARGET=TILE; TARGETDIR=tile
+       SOURCES="ffi.c tile.S"
         ;;
 
   vax-*-*)
        TARGET=VAX; TARGETDIR=vax
+       SOURCES="ffi.c elfbsd.S"
        ;;
 
   xtensa*-*)
        TARGET=XTENSA; TARGETDIR=xtensa
+       SOURCES="ffi.c sysv.S"
        ;;
 esac
+
+# ... but some of the cases above share configury.
+case "${TARGET}" in
+  MIPS)
+       SOURCES="ffi.c o32.S n32.S"
+       ;;
+  POWERPC)
+       SOURCES="ffi.c ffi_sysv.c ffi_linux64.c sysv.S ppc_closure.S"
+       SOURCES="${SOURCES} linux64.S linux64_closure.S"
+       ;;
+  POWERPC_AIX)
+       SOURCES="ffi_darwin.c aix.S aix_closure.S"
+       ;;
+  POWERPC_DARWIN)
+       SOURCES="ffi_darwin.c darwin.S darwin_closure.S"
+       ;;
+  POWERPC_FREEBSD)
+       SOURCES="ffi.c ffi_sysv.c sysv.S ppc_closure.S"
+       ;;
+  X86 | X86_FREEBSD | X86_WIN32)
+       SOURCES="ffi.c sysv.S"
+       ;;
+  X86_64)
+       SOURCES="ffi64.c unix64.S"
+       ;;
+  X86_WIN64)
+       SOURCES="ffiw64.c win64.S"
+       ;;
+  X86_DARWIN)
+       SOURCES="ffi.c darwin.S ffi64.c darwin64.S"
+       ;;
+esac
+
+# If we failed to configure SOURCES, we can't do anything.
+if test -z "${SOURCES}"; then
+  UNSUPPORTED=1
+fi
index fd28024..bb241e8 100644 (file)
@@ -3,7 +3,8 @@
 AUTOMAKE_OPTIONS=foreign
 
 DISTCLEANFILES=ffitarget.h
-EXTRA_DIST=ffi.h.in ffi_common.h
+noinst_HEADERS=ffi_common.h ffi_cfi.h
+EXTRA_DIST=ffi.h.in
 
 includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
 nodist_includes_HEADERS = ffi.h ffitarget.h