Revert "Merge pull request #36 from abergmeier/emscripten_fix" This reverts commit 6a4d901dde7b3f87984c563505717cde3113d16e, reversing changes made to b50a13b9c07ec09af4b9697e482acdad571e6961.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214
diff --git a/Makefile.am b/Makefile.am
index 936e62e..b57b2a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,144 +99,130 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
MAKEOVERRIDES=
-librarySOURCES = src/prep_cif.c src/types.c \
- src/raw_api.c src/java_raw_api.c src/closures.c
-
-if USE_LIBTOOL
toolexeclib_LTLIBRARIES = libffi.la
noinst_LTLIBRARIES = libffi_convenience.la
-libffi_la_SOURCES = librarySOURCES
-else
-lib_LIBRARIES = libffi.a
-noinst_LIBRARIES = libffi_convenience.a
-libffi_a_SOURCES = librarySOURCES
-endif
+
+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
-additionalSOURCES =
+nodist_libffi_la_SOURCES =
if FFI_DEBUG
-additionalSOURCES += src/debug.c
+nodist_libffi_la_SOURCES += src/debug.c
endif
if MIPS
-additionalSOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
+nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
endif
if BFIN
-additionalSOURCES += src/bfin/ffi.c src/bfin/sysv.S
+nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
endif
if X86
-additionalSOURCES += src/x86/ffi.c src/x86/sysv.S
+nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
endif
if X86_FREEBSD
-additionalSOURCES += src/x86/ffi.c src/x86/freebsd.S
+nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/freebsd.S
endif
if X86_WIN32
-additionalSOURCES += src/x86/ffi.c src/x86/win32.S
+nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win32.S
endif
if X86_WIN64
-additionalSOURCES += src/x86/ffi.c src/x86/win64.S
+nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/win64.S
endif
if X86_DARWIN
-additionalSOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
+nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/darwin.S src/x86/ffi64.c src/x86/darwin64.S
endif
if SPARC
-additionalSOURCES += src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
+nodist_libffi_la_SOURCES += src/sparc/ffi.c src/sparc/v8.S src/sparc/v9.S
endif
if ALPHA
-additionalSOURCES += src/alpha/ffi.c src/alpha/osf.S
+nodist_libffi_la_SOURCES += src/alpha/ffi.c src/alpha/osf.S
endif
if IA64
-additionalSOURCES += src/ia64/ffi.c src/ia64/unix.S
+nodist_libffi_la_SOURCES += src/ia64/ffi.c src/ia64/unix.S
endif
if M32R
-additionalSOURCES += src/m32r/sysv.S src/m32r/ffi.c
+nodist_libffi_la_SOURCES += src/m32r/sysv.S src/m32r/ffi.c
endif
if M68K
-additionalSOURCES += src/m68k/ffi.c src/m68k/sysv.S
+nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S
endif
if MOXIE
-additionalSOURCES += src/moxie/ffi.c src/moxie/eabi.S
+nodist_libffi_la_SOURCES += src/moxie/ffi.c src/moxie/eabi.S
endif
if MICROBLAZE
-additionalSOURCES += src/microblaze/ffi.c src/microblaze/sysv.S
+nodist_libffi_la_SOURCES += src/microblaze/ffi.c src/microblaze/sysv.S
endif
if POWERPC
-additionalSOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
+nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
endif
if POWERPC_AIX
-additionalSOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
+nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/aix.S src/powerpc/aix_closure.S
endif
if POWERPC_DARWIN
-additionalSOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
+nodist_libffi_la_SOURCES += src/powerpc/ffi_darwin.c src/powerpc/darwin.S src/powerpc/darwin_closure.S
endif
if POWERPC_FREEBSD
-additionalSOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
+nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
endif
if AARCH64
-additionalSOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
+nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
endif
if ARC
nodist_libffi_la_SOURCES += src/arc/sysv.S src/arc/ffi.c
endif
if ARM
-additionalSOURCES += src/arm/sysv.S src/arm/ffi.c
+nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
if FFI_EXEC_TRAMPOLINE_TABLE
-additionalSOURCES += src/arm/trampoline.S
+nodist_libffi_la_SOURCES += src/arm/trampoline.S
endif
endif
if AVR32
-additionalSOURCES += src/avr32/sysv.S src/avr32/ffi.c
+nodist_libffi_la_SOURCES += src/avr32/sysv.S src/avr32/ffi.c
endif
if LIBFFI_CRIS
-additionalSOURCES += src/cris/sysv.S src/cris/ffi.c
+nodist_libffi_la_SOURCES += src/cris/sysv.S src/cris/ffi.c
endif
if FRV
-additionalSOURCES += src/frv/eabi.S src/frv/ffi.c
+nodist_libffi_la_SOURCES += src/frv/eabi.S src/frv/ffi.c
endif
if S390
-additionalSOURCES += src/s390/sysv.S src/s390/ffi.c
+nodist_libffi_la_SOURCES += src/s390/sysv.S src/s390/ffi.c
endif
if X86_64
-additionalSOURCES += src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
+nodist_libffi_la_SOURCES += src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S
endif
if SH
-additionalSOURCES += src/sh/sysv.S src/sh/ffi.c
+nodist_libffi_la_SOURCES += src/sh/sysv.S src/sh/ffi.c
endif
if SH64
-additionalSOURCES += src/sh64/sysv.S src/sh64/ffi.c
+nodist_libffi_la_SOURCES += src/sh64/sysv.S src/sh64/ffi.c
endif
if PA_LINUX
-additionalSOURCES += src/pa/linux.S src/pa/ffi.c
+nodist_libffi_la_SOURCES += src/pa/linux.S src/pa/ffi.c
endif
if PA_HPUX
-additionalSOURCES += src/pa/hpux32.S src/pa/ffi.c
+nodist_libffi_la_SOURCES += src/pa/hpux32.S src/pa/ffi.c
endif
if TILE
-additionalSOURCES += src/tile/tile.S src/tile/ffi.c
+nodist_libffi_la_SOURCES += src/tile/tile.S src/tile/ffi.c
endif
if XTENSA
-additionalSOURCES += src/xtensa/sysv.S src/xtensa/ffi.c
+nodist_libffi_la_SOURCES += src/xtensa/sysv.S src/xtensa/ffi.c
endif
if METAG
-additionalSOURCES += src/metag/sysv.S src/metag/ffi.c
+nodist_libffi_la_SOURCES += src/metag/sysv.S src/metag/ffi.c
endif
-if USE_LIBTOOL
-nodist_libffi_la_SOURCES = additionalSOURCES
libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/libtool-ldflags $(LDFLAGS))
libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
-else
-nodist_libffi_a_SOURCES = additionalSOURCES
-libffi_convenience_a_SOURCES = $(libffi_a_SOURCES)
-nodist_libffi_convenience_a_SOURCES = $(nodist_libffi_a_SOURCES)
-endif
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/configure.ac b/configure.ac
index a46a514..a26cb46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ AC_SUBST(CFLAGS)
AM_PROG_AS
AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIR([m4])
# Test for 64-bit build.
@@ -538,14 +539,6 @@ AC_ARG_ENABLE(purify-safety,
if test "$enable_purify_safety" = "yes"; then
AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
fi)
-
-AC_ARG_ENABLE(libtool,
-[ --disable-libtool do not use libtool to handle libraries])
-AM_CONDITIONAL(USE_LIBTOOL, !test "x$enable_libtool" = "xno")
-
-if test "x$enable_libtool" = "xyes"; then
-AC_PROG_LIBTOOL
-fi
# These variables are only ever used when we cross-build to X86_WIN32.
# And we only support this with GCC, so...