| Index: libffi/ChangeLog |
| =================================================================== |
| --- libffi.orig/ChangeLog |
| +++ libffi/ChangeLog |
| @@ -243,6 +243,13 @@ |
| * testsuite/libffi.call/cls_longdouble.c: Likewise. |
| * testsuite/libffi.call/huge_struct.c: Likewise. |
| |
| +2010-08-05 Dan Witte <dwitte@mozilla.com> |
| + |
| + * Makefile.am: Pass FFI_DEBUG define to msvcc.sh for linking to the |
| + debug CRT when --enable-debug is given. |
| + * configure.ac: Define it. |
| + * msvcc.sh: Translate -g and -DFFI_DEBUG appropriately. |
| + |
| 2010-08-04 Dan Witte <dwitte@mozilla.com> |
| |
| * src/x86/ffitarget.h: Add X86_ANY define for all x86/x86_64 |
| Index: libffi/Makefile.am |
| =================================================================== |
| --- libffi.orig/Makefile.am |
| +++ libffi/Makefile.am |
| @@ -180,6 +180,14 @@ libffi_convenience_la_SOURCES = $(libffi |
| nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) |
| |
| AM_CFLAGS = -Wall -g -fexceptions |
| +if FFI_DEBUG |
| +# Build debug. Define FFI_DEBUG on the commandline so that, when building with |
| +# MSVC, it can link against the debug CRT. |
| +AM_CFLAGS += -DFFI_DEBUG |
| +else |
| +# Build opt. |
| +AM_CFLAGS += -O2 |
| +endif |
| |
| libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) |
| |
| Index: libffi/configure.ac |
| =================================================================== |
| --- libffi.orig/configure.ac |
| +++ libffi/configure.ac |
| @@ -16,10 +16,14 @@ AM_INIT_AUTOMAKE |
| # We must force CC to /not/ be precious variables; otherwise |
| # the wrong, non-multilib-adjusted value will be used in multilibs. |
| # As a side effect, we have to subst CFLAGS ourselves. |
| +# Also save and restore CFLAGS, since AC_PROG_CC will come up with |
| +# defaults of its own if none are provided. |
| |
| m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) |
| m4_define([_AC_ARG_VAR_PRECIOUS],[]) |
| +save_CFLAGS=$CFLAGS |
| AC_PROG_CC |
| +CFLAGS=$save_CFLAGS |
| m4_undefine([_AC_ARG_VAR_PRECIOUS]) |
| m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) |
| |
| @@ -409,6 +413,7 @@ AC_ARG_ENABLE(debug, |
| if test "$enable_debug" = "yes"; then |
| AC_DEFINE(FFI_DEBUG, 1, [Define this if you want extra debugging.]) |
| fi) |
| +AM_CONDITIONAL(FFI_DEBUG, test "$enable_debug" = "yes") |
| |
| AC_ARG_ENABLE(structs, |
| [ --disable-structs omit code for struct support], |
| Index: libffi/Makefile.in |
| =================================================================== |
| --- libffi.orig/Makefile.in |
| +++ libffi/Makefile.in |
| @@ -15,6 +15,7 @@ |
| |
| @SET_MAKE@ |
| |
| + |
| VPATH = @srcdir@ |
| pkgdatadir = $(datadir)/@PACKAGE@ |
| pkgincludedir = $(includedir)/@PACKAGE@ |
| @@ -54,36 +55,38 @@ target_triplet = @target@ |
| @AVR32_TRUE@am__append_17 = src/avr32/sysv.S src/avr32/ffi.c |
| @LIBFFI_CRIS_TRUE@am__append_18 = src/cris/sysv.S src/cris/ffi.c |
| @FRV_TRUE@am__append_19 = src/frv/eabi.S src/frv/ffi.c |
| -@S390_TRUE@am__append_20 = src/s390/sysv.S src/s390/ffi.c |
| -@X86_64_TRUE@am__append_21 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S |
| -@SH_TRUE@am__append_22 = src/sh/sysv.S src/sh/ffi.c |
| -@SH64_TRUE@am__append_23 = src/sh64/sysv.S src/sh64/ffi.c |
| -@PA_LINUX_TRUE@am__append_24 = src/pa/linux.S src/pa/ffi.c |
| -@PA_HPUX_TRUE@am__append_25 = src/pa/hpux32.S src/pa/ffi.c |
| +@MOXIE_TRUE@am__append_20 = src/moxie/eabi.S src/moxie/ffi.c |
| +@S390_TRUE@am__append_21 = src/s390/sysv.S src/s390/ffi.c |
| +@X86_64_TRUE@am__append_22 = src/x86/ffi64.c src/x86/unix64.S src/x86/ffi.c src/x86/sysv.S |
| +@SH_TRUE@am__append_23 = src/sh/sysv.S src/sh/ffi.c |
| +@SH64_TRUE@am__append_24 = src/sh64/sysv.S src/sh64/ffi.c |
| +@PA_LINUX_TRUE@am__append_25 = src/pa/linux.S src/pa/ffi.c |
| +@PA_HPUX_TRUE@am__append_26 = src/pa/hpux32.S src/pa/ffi.c |
| +# Build debug. Define FFI_DEBUG on the commandline so that, when building with |
| +# MSVC, it can link against the debug CRT. |
| +@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG |
| +# Build opt. |
| +@FFI_DEBUG_FALSE@am__append_28 = -O2 |
| subdir = . |
| -DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ |
| - $(srcdir)/../config.guess $(srcdir)/../config.sub \ |
| - $(srcdir)/../depcomp $(srcdir)/../install-sh \ |
| - $(srcdir)/../ltmain.sh $(srcdir)/../missing \ |
| - $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ |
| - $(srcdir)/Makefile.in $(srcdir)/fficonfig.h.in \ |
| - $(top_srcdir)/configure ChangeLog |
| +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
| + $(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \ |
| + $(srcdir)/doc/version.texi $(srcdir)/fficonfig.h.in \ |
| + $(srcdir)/libffi.pc.in $(top_srcdir)/configure ChangeLog \ |
| + compile config.guess config.sub depcomp install-sh ltmain.sh \ |
| + mdate-sh missing texinfo.tex |
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
| -am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ |
| - $(top_srcdir)/../config/lead-dot.m4 \ |
| - $(top_srcdir)/../config/multi.m4 \ |
| - $(top_srcdir)/../config/override.m4 \ |
| - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ |
| - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ |
| - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ |
| +am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \ |
| + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
| + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
| + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ |
| $(top_srcdir)/configure.ac |
| am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
| $(ACLOCAL_M4) |
| am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
| configure.lineno config.status.lineno |
| -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs |
| +mkinstalldirs = $(install_sh) -d |
| CONFIG_HEADER = fficonfig.h |
| -CONFIG_CLEAN_FILES = |
| +CONFIG_CLEAN_FILES = libffi.pc |
| CONFIG_CLEAN_VPATH_FILES = |
| am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
| am__vpath_adj = case $$p in \ |
| @@ -106,8 +109,9 @@ am__nobase_list = $(am__nobase_strip_set |
| am__base_list = \ |
| sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
| sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
| -am__installdirs = "$(DESTDIR)$(toolexeclibdir)" |
| -LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) |
| +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" \ |
| + "$(DESTDIR)$(pkgconfigdir)" |
| +LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) |
| libffi_la_LIBADD = |
| am__dirstamp = $(am__leading_dot)dirstamp |
| am_libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ |
| @@ -143,13 +147,14 @@ am_libffi_la_OBJECTS = src/debug.lo src/ |
| @AVR32_TRUE@am__objects_17 = src/avr32/sysv.lo src/avr32/ffi.lo |
| @LIBFFI_CRIS_TRUE@am__objects_18 = src/cris/sysv.lo src/cris/ffi.lo |
| @FRV_TRUE@am__objects_19 = src/frv/eabi.lo src/frv/ffi.lo |
| -@S390_TRUE@am__objects_20 = src/s390/sysv.lo src/s390/ffi.lo |
| -@X86_64_TRUE@am__objects_21 = src/x86/ffi64.lo src/x86/unix64.lo \ |
| +@MOXIE_TRUE@am__objects_20 = src/moxie/eabi.lo src/moxie/ffi.lo |
| +@S390_TRUE@am__objects_21 = src/s390/sysv.lo src/s390/ffi.lo |
| +@X86_64_TRUE@am__objects_22 = src/x86/ffi64.lo src/x86/unix64.lo \ |
| @X86_64_TRUE@ src/x86/ffi.lo src/x86/sysv.lo |
| -@SH_TRUE@am__objects_22 = src/sh/sysv.lo src/sh/ffi.lo |
| -@SH64_TRUE@am__objects_23 = src/sh64/sysv.lo src/sh64/ffi.lo |
| -@PA_LINUX_TRUE@am__objects_24 = src/pa/linux.lo src/pa/ffi.lo |
| -@PA_HPUX_TRUE@am__objects_25 = src/pa/hpux32.lo src/pa/ffi.lo |
| +@SH_TRUE@am__objects_23 = src/sh/sysv.lo src/sh/ffi.lo |
| +@SH64_TRUE@am__objects_24 = src/sh64/sysv.lo src/sh64/ffi.lo |
| +@PA_LINUX_TRUE@am__objects_25 = src/pa/linux.lo src/pa/ffi.lo |
| +@PA_HPUX_TRUE@am__objects_26 = src/pa/hpux32.lo src/pa/ffi.lo |
| nodist_libffi_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ |
| $(am__objects_3) $(am__objects_4) $(am__objects_5) \ |
| $(am__objects_6) $(am__objects_7) $(am__objects_8) \ |
| @@ -158,17 +163,17 @@ nodist_libffi_la_OBJECTS = $(am__objects |
| $(am__objects_15) $(am__objects_16) $(am__objects_17) \ |
| $(am__objects_18) $(am__objects_19) $(am__objects_20) \ |
| $(am__objects_21) $(am__objects_22) $(am__objects_23) \ |
| - $(am__objects_24) $(am__objects_25) |
| + $(am__objects_24) $(am__objects_25) $(am__objects_26) |
| libffi_la_OBJECTS = $(am_libffi_la_OBJECTS) \ |
| $(nodist_libffi_la_OBJECTS) |
| libffi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
| $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
| $(libffi_la_LDFLAGS) $(LDFLAGS) -o $@ |
| libffi_convenience_la_LIBADD = |
| -am__objects_26 = src/debug.lo src/prep_cif.lo src/types.lo \ |
| +am__objects_27 = src/debug.lo src/prep_cif.lo src/types.lo \ |
| src/raw_api.lo src/java_raw_api.lo src/closures.lo |
| -am_libffi_convenience_la_OBJECTS = $(am__objects_26) |
| -am__objects_27 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ |
| +am_libffi_convenience_la_OBJECTS = $(am__objects_27) |
| +am__objects_28 = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ |
| $(am__objects_4) $(am__objects_5) $(am__objects_6) \ |
| $(am__objects_7) $(am__objects_8) $(am__objects_9) \ |
| $(am__objects_10) $(am__objects_11) $(am__objects_12) \ |
| @@ -176,12 +181,12 @@ am__objects_27 = $(am__objects_1) $(am__ |
| $(am__objects_16) $(am__objects_17) $(am__objects_18) \ |
| $(am__objects_19) $(am__objects_20) $(am__objects_21) \ |
| $(am__objects_22) $(am__objects_23) $(am__objects_24) \ |
| - $(am__objects_25) |
| -nodist_libffi_convenience_la_OBJECTS = $(am__objects_27) |
| + $(am__objects_25) $(am__objects_26) |
| +nodist_libffi_convenience_la_OBJECTS = $(am__objects_28) |
| libffi_convenience_la_OBJECTS = $(am_libffi_convenience_la_OBJECTS) \ |
| $(nodist_libffi_convenience_la_OBJECTS) |
| DEFAULT_INCLUDES = -I.@am__isrc@ |
| -depcomp = $(SHELL) $(top_srcdir)/../depcomp |
| +depcomp = $(SHELL) $(top_srcdir)/depcomp |
| am__depfiles_maybe = depfiles |
| am__mv = mv -f |
| CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |
| @@ -202,12 +207,18 @@ SOURCES = $(libffi_la_SOURCES) $(nodist_ |
| $(libffi_convenience_la_SOURCES) \ |
| $(nodist_libffi_convenience_la_SOURCES) |
| DIST_SOURCES = $(libffi_la_SOURCES) $(libffi_convenience_la_SOURCES) |
| -MULTISRCTOP = |
| -MULTIBUILDTOP = |
| -MULTIDIRS = |
| -MULTISUBDIR = |
| -MULTIDO = true |
| -MULTICLEAN = true |
| +INFO_DEPS = $(srcdir)/doc/libffi.info |
| +am__TEXINFO_TEX_DIR = $(srcdir) |
| +DVIS = doc/libffi.dvi |
| +PDFS = doc/libffi.pdf |
| +PSS = doc/libffi.ps |
| +HTMLS = doc/libffi.html |
| +TEXINFOS = doc/libffi.texi |
| +TEXI2DVI = texi2dvi |
| +TEXI2PDF = $(TEXI2DVI) --pdf --batch |
| +MAKEINFOHTML = $(MAKEINFO) --html |
| +AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) |
| +DVIPS = dvips |
| RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
| html-recursive info-recursive install-data-recursive \ |
| install-dvi-recursive install-exec-recursive \ |
| @@ -215,6 +226,7 @@ RECURSIVE_TARGETS = all-recursive check- |
| install-pdf-recursive install-ps-recursive install-recursive \ |
| installcheck-recursive installdirs-recursive pdf-recursive \ |
| ps-recursive uninstall-recursive |
| +DATA = $(pkgconfig_DATA) |
| RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
| distclean-recursive maintainer-clean-recursive |
| AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
| @@ -280,6 +292,7 @@ CPPFLAGS = @CPPFLAGS@ |
| CYGPATH_W = @CYGPATH_W@ |
| DEFS = @DEFS@ |
| DEPDIR = @DEPDIR@ |
| +DLLTOOL = @DLLTOOL@ |
| DSYMUTIL = @DSYMUTIL@ |
| DUMPBIN = @DUMPBIN@ |
| ECHO_C = @ECHO_C@ |
| @@ -305,6 +318,7 @@ LN_S = @LN_S@ |
| LTLIBOBJS = @LTLIBOBJS@ |
| MAINT = @MAINT@ |
| MAKEINFO = @MAKEINFO@ |
| +MANIFEST_TOOL = @MANIFEST_TOOL@ |
| MKDIR_P = @MKDIR_P@ |
| NM = @NM@ |
| NMEDIT = @NMEDIT@ |
| @@ -332,6 +346,7 @@ abs_builddir = @abs_builddir@ |
| abs_srcdir = @abs_srcdir@ |
| abs_top_builddir = @abs_top_builddir@ |
| abs_top_srcdir = @abs_top_srcdir@ |
| +ac_ct_AR = @ac_ct_AR@ |
| ac_ct_CC = @ac_ct_CC@ |
| ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
| am__include = @am__include@ |
| @@ -366,7 +381,6 @@ localedir = @localedir@ |
| localstatedir = @localstatedir@ |
| mandir = @mandir@ |
| mkdir_p = @mkdir_p@ |
| -multi_basedir = @multi_basedir@ |
| oldincludedir = @oldincludedir@ |
| pdfdir = @pdfdir@ |
| prefix = @prefix@ |
| @@ -387,7 +401,6 @@ top_build_prefix = @top_build_prefix@ |
| top_builddir = @top_builddir@ |
| top_srcdir = @top_srcdir@ |
| AUTOMAKE_OPTIONS = foreign subdir-objects |
| -ACLOCAL_AMFLAGS = -I .. -I ../config |
| SUBDIRS = include testsuite man |
| EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \ |
| src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \ |
| @@ -412,10 +425,16 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change |
| src/sparc/v8.S src/sparc/v9.S src/sparc/ffitarget.h \ |
| src/sparc/ffi.c src/x86/darwin64.S \ |
| src/x86/ffi.c src/x86/sysv.S src/x86/win32.S src/x86/darwin.S \ |
| + src/x86/win64.S src/x86/freebsd.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/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c |
| + src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h \ |
| + src/dlmalloc.c \ |
| + src/moxie/ffi.c src/moxie/eabi.S \ |
| + libtool-version ChangeLog.libffi m4/libtool.m4 \ |
| + m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 |
| |
| +info_TEXINFOS = doc/libffi.texi |
| |
| # Work around what appears to be a GNU make bug handling MAKEFLAGS |
| # values defined in terms of make variables, as is the case for CC and |
| @@ -456,11 +475,14 @@ AM_MAKEFLAGS = \ |
| "DESTDIR=$(DESTDIR)" |
| |
| MAKEOVERRIDES = |
| -toolexeclib_LTLIBRARIES = libffi.la |
| +ACLOCAL_AMFLAGS = $(ACLOCAL_AMFLAGS) -I m4 |
| +lib_LTLIBRARIES = libffi.la |
| noinst_LTLIBRARIES = libffi_convenience.la |
| libffi_la_SOURCES = src/debug.c 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 = $(am__append_1) $(am__append_2) \ |
| $(am__append_3) $(am__append_4) $(am__append_5) \ |
| $(am__append_6) $(am__append_7) $(am__append_8) \ |
| @@ -469,11 +491,10 @@ nodist_libffi_la_SOURCES = $(am__append_ |
| $(am__append_15) $(am__append_16) $(am__append_17) \ |
| $(am__append_18) $(am__append_19) $(am__append_20) \ |
| $(am__append_21) $(am__append_22) $(am__append_23) \ |
| - $(am__append_24) $(am__append_25) |
| + $(am__append_24) $(am__append_25) $(am__append_26) |
| libffi_convenience_la_SOURCES = $(libffi_la_SOURCES) |
| nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES) |
| -AM_CFLAGS = -Wall -g -fexceptions |
| -LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) |
| +AM_CFLAGS = -Wall -g -fexceptions $(am__append_27) $(am__append_28) |
| libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS) |
| AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src |
| AM_CCASFLAGS = $(AM_CPPFLAGS) |
| @@ -481,7 +502,7 @@ all: fficonfig.h |
| $(MAKE) $(AM_MAKEFLAGS) all-recursive |
| |
| .SUFFIXES: |
| -.SUFFIXES: .S .c .lo .o .obj |
| +.SUFFIXES: .S .c .dvi .lo .o .obj .ps |
| am--refresh: |
| @: |
| $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
| @@ -533,41 +554,43 @@ $(srcdir)/fficonfig.h.in: @MAINTAINER_MO |
| |
| distclean-hdr: |
| -rm -f fficonfig.h stamp-h1 |
| - |
| -clean-noinstLTLIBRARIES: |
| - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) |
| - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ |
| - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
| - test "$$dir" != "$$p" || dir=.; \ |
| - echo "rm -f \"$${dir}/so_locations\""; \ |
| - rm -f "$${dir}/so_locations"; \ |
| - done |
| -install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) |
| +libffi.pc: $(top_builddir)/config.status $(srcdir)/libffi.pc.in |
| + cd $(top_builddir) && $(SHELL) ./config.status $@ |
| +install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
| @$(NORMAL_INSTALL) |
| - test -z "$(toolexeclibdir)" || $(MKDIR_P) "$(DESTDIR)$(toolexeclibdir)" |
| - @list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \ |
| + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" |
| + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
| list2=; for p in $$list; do \ |
| if test -f $$p; then \ |
| list2="$$list2 $$p"; \ |
| else :; fi; \ |
| done; \ |
| test -z "$$list2" || { \ |
| - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(toolexeclibdir)'"; \ |
| - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(toolexeclibdir)"; \ |
| + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ |
| + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ |
| } |
| |
| -uninstall-toolexeclibLTLIBRARIES: |
| +uninstall-libLTLIBRARIES: |
| @$(NORMAL_UNINSTALL) |
| - @list='$(toolexeclib_LTLIBRARIES)'; test -n "$(toolexeclibdir)" || list=; \ |
| + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
| for p in $$list; do \ |
| $(am__strip_dir) \ |
| - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(toolexeclibdir)/$$f'"; \ |
| - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(toolexeclibdir)/$$f"; \ |
| + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ |
| + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ |
| done |
| |
| -clean-toolexeclibLTLIBRARIES: |
| - -test -z "$(toolexeclib_LTLIBRARIES)" || rm -f $(toolexeclib_LTLIBRARIES) |
| - @list='$(toolexeclib_LTLIBRARIES)'; for p in $$list; do \ |
| +clean-libLTLIBRARIES: |
| + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) |
| + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ |
| + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
| + test "$$dir" != "$$p" || dir=.; \ |
| + echo "rm -f \"$${dir}/so_locations\""; \ |
| + rm -f "$${dir}/so_locations"; \ |
| + done |
| + |
| +clean-noinstLTLIBRARIES: |
| + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) |
| + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ |
| dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ |
| test "$$dir" != "$$p" || dir=.; \ |
| echo "rm -f \"$${dir}/so_locations\""; \ |
| @@ -737,6 +760,16 @@ src/frv/eabi.lo: src/frv/$(am__dirstamp) |
| src/frv/$(DEPDIR)/$(am__dirstamp) |
| src/frv/ffi.lo: src/frv/$(am__dirstamp) \ |
| src/frv/$(DEPDIR)/$(am__dirstamp) |
| +src/moxie/$(am__dirstamp): |
| + @$(MKDIR_P) src/moxie |
| + @: > src/moxie/$(am__dirstamp) |
| +src/moxie/$(DEPDIR)/$(am__dirstamp): |
| + @$(MKDIR_P) src/moxie/$(DEPDIR) |
| + @: > src/moxie/$(DEPDIR)/$(am__dirstamp) |
| +src/moxie/eabi.lo: src/moxie/$(am__dirstamp) \ |
| + src/moxie/$(DEPDIR)/$(am__dirstamp) |
| +src/moxie/ffi.lo: src/moxie/$(am__dirstamp) \ |
| + src/moxie/$(DEPDIR)/$(am__dirstamp) |
| src/s390/$(am__dirstamp): |
| @$(MKDIR_P) src/s390 |
| @: > src/s390/$(am__dirstamp) |
| @@ -780,7 +813,7 @@ src/pa/ffi.lo: src/pa/$(am__dirstamp) sr |
| src/pa/hpux32.lo: src/pa/$(am__dirstamp) \ |
| src/pa/$(DEPDIR)/$(am__dirstamp) |
| libffi.la: $(libffi_la_OBJECTS) $(libffi_la_DEPENDENCIES) |
| - $(libffi_la_LINK) -rpath $(toolexeclibdir) $(libffi_la_OBJECTS) $(libffi_la_LIBADD) $(LIBS) |
| + $(libffi_la_LINK) -rpath $(libdir) $(libffi_la_OBJECTS) $(libffi_la_LIBADD) $(LIBS) |
| libffi_convenience.la: $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_DEPENDENCIES) |
| $(LINK) $(libffi_convenience_la_OBJECTS) $(libffi_convenience_la_LIBADD) $(LIBS) |
| |
| @@ -830,6 +863,10 @@ mostlyclean-compile: |
| -rm -f src/mips/n32.lo |
| -rm -f src/mips/o32.$(OBJEXT) |
| -rm -f src/mips/o32.lo |
| + -rm -f src/moxie/eabi.$(OBJEXT) |
| + -rm -f src/moxie/eabi.lo |
| + -rm -f src/moxie/ffi.$(OBJEXT) |
| + -rm -f src/moxie/ffi.lo |
| -rm -f src/pa/ffi.$(OBJEXT) |
| -rm -f src/pa/ffi.lo |
| -rm -f src/pa/hpux32.$(OBJEXT) |
| @@ -927,6 +964,8 @@ distclean-compile: |
| @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/ffi.Plo@am__quote@ |
| @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/n32.Plo@am__quote@ |
| @AMDEP_TRUE@@am__include@ @am__quote@src/mips/$(DEPDIR)/o32.Plo@am__quote@ |
| +@AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/eabi.Plo@am__quote@ |
| +@AMDEP_TRUE@@am__include@ @am__quote@src/moxie/$(DEPDIR)/ffi.Plo@am__quote@ |
| @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/ffi.Plo@am__quote@ |
| @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/hpux32.Plo@am__quote@ |
| @AMDEP_TRUE@@am__include@ @am__quote@src/pa/$(DEPDIR)/linux.Plo@am__quote@ |
| @@ -1022,6 +1061,7 @@ clean-libtool: |
| -rm -rf src/m32r/.libs src/m32r/_libs |
| -rm -rf src/m68k/.libs src/m68k/_libs |
| -rm -rf src/mips/.libs src/mips/_libs |
| + -rm -rf src/moxie/.libs src/moxie/_libs |
| -rm -rf src/pa/.libs src/pa/_libs |
| -rm -rf src/powerpc/.libs src/powerpc/_libs |
| -rm -rf src/s390/.libs src/s390/_libs |
| @@ -1032,23 +1072,191 @@ clean-libtool: |
| |
| distclean-libtool: |
| -rm -f libtool config.lt |
| +doc/$(am__dirstamp): |
| + @$(MKDIR_P) doc |
| + @: > doc/$(am__dirstamp) |
| + |
| +$(srcdir)/doc/libffi.info: doc/libffi.texi $(srcdir)/doc/version.texi |
| + restore=: && backupdir="$(am__leading_dot)am$$$$" && \ |
| + am__cwd=`pwd` && $(am__cd) $(srcdir) && \ |
| + rm -rf $$backupdir && mkdir $$backupdir && \ |
| + if ($(MAKEINFO) --version) >/dev/null 2>&1; then \ |
| + for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \ |
| + if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \ |
| + done; \ |
| + else :; fi && \ |
| + cd "$$am__cwd"; \ |
| + if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \ |
| + -o $@ $(srcdir)/doc/libffi.texi; \ |
| + then \ |
| + rc=0; \ |
| + $(am__cd) $(srcdir); \ |
| + else \ |
| + rc=$$?; \ |
| + $(am__cd) $(srcdir) && \ |
| + $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \ |
| + fi; \ |
| + rm -rf $$backupdir; exit $$rc |
| + |
| +doc/libffi.dvi: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) |
| + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ |
| + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ |
| + $(TEXI2DVI) -o $@ `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi |
| + |
| +doc/libffi.pdf: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) |
| + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ |
| + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ |
| + $(TEXI2PDF) -o $@ `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi |
| + |
| +doc/libffi.html: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) |
| + rm -rf $(@:.html=.htp) |
| + if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \ |
| + -o $(@:.html=.htp) `test -f 'doc/libffi.texi' || echo '$(srcdir)/'`doc/libffi.texi; \ |
| + then \ |
| + rm -rf $@; \ |
| + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ |
| + mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ |
| + else \ |
| + if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ |
| + rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ |
| + exit 1; \ |
| + fi |
| +$(srcdir)/doc/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/doc/stamp-vti |
| +$(srcdir)/doc/stamp-vti: doc/libffi.texi $(top_srcdir)/configure |
| + test -f doc/$(am__dirstamp) || $(MAKE) $(AM_MAKEFLAGS) doc/$(am__dirstamp) |
| + @(dir=.; test -f ./doc/libffi.texi || dir=$(srcdir); \ |
| + set `$(SHELL) $(srcdir)/mdate-sh $$dir/doc/libffi.texi`; \ |
| + echo "@set UPDATED $$1 $$2 $$3"; \ |
| + echo "@set UPDATED-MONTH $$2 $$3"; \ |
| + echo "@set EDITION $(VERSION)"; \ |
| + echo "@set VERSION $(VERSION)") > vti.tmp |
| + @cmp -s vti.tmp $(srcdir)/doc/version.texi \ |
| + || (echo "Updating $(srcdir)/doc/version.texi"; \ |
| + cp vti.tmp $(srcdir)/doc/version.texi) |
| + -@rm -f vti.tmp |
| + @cp $(srcdir)/doc/version.texi $@ |
| + |
| +mostlyclean-vti: |
| + -rm -f vti.tmp |
| + |
| +maintainer-clean-vti: |
| +@MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi |
| +.dvi.ps: |
| + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ |
| + $(DVIPS) -o $@ $< |
| + |
| +uninstall-dvi-am: |
| + @$(NORMAL_UNINSTALL) |
| + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ |
| + for p in $$list; do \ |
| + $(am__strip_dir) \ |
| + echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \ |
| + rm -f "$(DESTDIR)$(dvidir)/$$f"; \ |
| + done |
| + |
| +uninstall-html-am: |
| + @$(NORMAL_UNINSTALL) |
| + @list='$(HTMLS)'; test -n "$(htmldir)" || list=; \ |
| + for p in $$list; do \ |
| + $(am__strip_dir) \ |
| + echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \ |
| + rm -rf "$(DESTDIR)$(htmldir)/$$f"; \ |
| + done |
| |
| -# GNU Make needs to see an explicit $(MAKE) variable in the command it |
| -# runs to enable its job server during parallel builds. Hence the |
| -# comments below. |
| -all-multi: |
| - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) |
| -install-multi: |
| - $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE) |
| - |
| -mostlyclean-multi: |
| - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE) |
| -clean-multi: |
| - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE) |
| -distclean-multi: |
| - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE) |
| -maintainer-clean-multi: |
| - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE) |
| +uninstall-info-am: |
| + @$(PRE_UNINSTALL) |
| + @if test -d '$(DESTDIR)$(infodir)' && \ |
| + (install-info --version && \ |
| + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ |
| + list='$(INFO_DEPS)'; \ |
| + for file in $$list; do \ |
| + relfile=`echo "$$file" | sed 's|^.*/||'`; \ |
| + echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \ |
| + if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \ |
| + then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \ |
| + done; \ |
| + else :; fi |
| + @$(NORMAL_UNINSTALL) |
| + @list='$(INFO_DEPS)'; \ |
| + for file in $$list; do \ |
| + relfile=`echo "$$file" | sed 's|^.*/||'`; \ |
| + relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ |
| + (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ |
| + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ |
| + rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ |
| + else :; fi); \ |
| + done |
| + |
| +uninstall-pdf-am: |
| + @$(NORMAL_UNINSTALL) |
| + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ |
| + for p in $$list; do \ |
| + $(am__strip_dir) \ |
| + echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \ |
| + rm -f "$(DESTDIR)$(pdfdir)/$$f"; \ |
| + done |
| + |
| +uninstall-ps-am: |
| + @$(NORMAL_UNINSTALL) |
| + @list='$(PSS)'; test -n "$(psdir)" || list=; \ |
| + for p in $$list; do \ |
| + $(am__strip_dir) \ |
| + echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \ |
| + rm -f "$(DESTDIR)$(psdir)/$$f"; \ |
| + done |
| + |
| +dist-info: $(INFO_DEPS) |
| + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ |
| + list='$(INFO_DEPS)'; \ |
| + for base in $$list; do \ |
| + case $$base in \ |
| + $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ |
| + esac; \ |
| + if test -f $$base; then d=.; else d=$(srcdir); fi; \ |
| + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ |
| + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ |
| + if test -f $$file; then \ |
| + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ |
| + test -f "$(distdir)/$$relfile" || \ |
| + cp -p $$file "$(distdir)/$$relfile"; \ |
| + else :; fi; \ |
| + done; \ |
| + done |
| + |
| +mostlyclean-aminfo: |
| + -rm -rf libffi.aux libffi.cp libffi.cps libffi.fn libffi.ky libffi.log \ |
| + libffi.pg libffi.tmp libffi.toc libffi.tp libffi.vr |
| + |
| +clean-aminfo: |
| + -test -z "doc/libffi.dvi doc/libffi.pdf doc/libffi.ps doc/libffi.html" \ |
| + || rm -rf doc/libffi.dvi doc/libffi.pdf doc/libffi.ps doc/libffi.html |
| + |
| +maintainer-clean-aminfo: |
| + @list='$(INFO_DEPS)'; for i in $$list; do \ |
| + i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ |
| + echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ |
| + rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ |
| + done |
| +install-pkgconfigDATA: $(pkgconfig_DATA) |
| + @$(NORMAL_INSTALL) |
| + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" |
| + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
| + for p in $$list; do \ |
| + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| + echo "$$d$$p"; \ |
| + done | $(am__base_list) | \ |
| + while read files; do \ |
| + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ |
| + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ |
| + done |
| + |
| +uninstall-pkgconfigDATA: |
| + @$(NORMAL_UNINSTALL) |
| + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ |
| + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
| + test -n "$$files" || exit 0; \ |
| + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ |
| + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files |
| |
| # This directory's subdirectories are mostly independent; you can cd |
| # into them and run `make' without going through this Makefile. |
| @@ -1245,6 +1453,9 @@ distdir: $(DISTFILES) |
| || exit 1; \ |
| fi; \ |
| done |
| + $(MAKE) $(AM_MAKEFLAGS) \ |
| + top_distdir="$(top_distdir)" distdir="$(distdir)" \ |
| + dist-info |
| -test -n "$(am__skip_mode_fix)" \ |
| || find "$(distdir)" -type d ! -perm -755 \ |
| -exec chmod u+rwx,go+rx {} \; -o \ |
| @@ -1362,10 +1573,10 @@ distcleancheck: distclean |
| exit 1; } >&2 |
| check-am: all-am |
| check: check-recursive |
| -all-am: Makefile $(LTLIBRARIES) all-multi fficonfig.h |
| +all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(DATA) fficonfig.h |
| installdirs: installdirs-recursive |
| installdirs-am: |
| - for dir in "$(DESTDIR)$(toolexeclibdir)"; do \ |
| + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(pkgconfigdir)"; do \ |
| test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
| done |
| install: install-recursive |
| @@ -1389,6 +1600,7 @@ clean-generic: |
| distclean-generic: |
| -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
| -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
| + -rm -f doc/$(am__dirstamp) |
| -rm -f src/$(DEPDIR)/$(am__dirstamp) |
| -rm -f src/$(am__dirstamp) |
| -rm -f src/alpha/$(DEPDIR)/$(am__dirstamp) |
| @@ -1409,6 +1621,8 @@ distclean-generic: |
| -rm -f src/m68k/$(am__dirstamp) |
| -rm -f src/mips/$(DEPDIR)/$(am__dirstamp) |
| -rm -f src/mips/$(am__dirstamp) |
| + -rm -f src/moxie/$(DEPDIR)/$(am__dirstamp) |
| + -rm -f src/moxie/$(am__dirstamp) |
| -rm -f src/pa/$(DEPDIR)/$(am__dirstamp) |
| -rm -f src/pa/$(am__dirstamp) |
| -rm -f src/powerpc/$(DEPDIR)/$(am__dirstamp) |
| @@ -1427,114 +1641,186 @@ distclean-generic: |
| maintainer-clean-generic: |
| @echo "This command is intended for maintainers to use" |
| @echo "it deletes files that may require special tools to rebuild." |
| -clean: clean-multi clean-recursive |
| +clean: clean-recursive |
| |
| -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ |
| - clean-toolexeclibLTLIBRARIES mostlyclean-am |
| +clean-am: clean-aminfo clean-generic clean-libLTLIBRARIES \ |
| + clean-libtool clean-noinstLTLIBRARIES mostlyclean-am |
| |
| -distclean: distclean-multi distclean-recursive |
| +distclean: distclean-recursive |
| -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
| - -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) |
| + -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) |
| -rm -f Makefile |
| distclean-am: clean-am distclean-compile distclean-generic \ |
| distclean-hdr distclean-libtool distclean-tags |
| |
| dvi: dvi-recursive |
| |
| -dvi-am: |
| +dvi-am: $(DVIS) |
| |
| html: html-recursive |
| |
| -html-am: |
| +html-am: $(HTMLS) |
| |
| info: info-recursive |
| |
| -info-am: |
| +info-am: $(INFO_DEPS) |
| |
| -install-data-am: |
| +install-data-am: install-info-am install-pkgconfigDATA |
| |
| install-dvi: install-dvi-recursive |
| |
| -install-dvi-am: |
| - |
| -install-exec-am: install-multi install-toolexeclibLTLIBRARIES |
| - |
| -install-html: install-html-recursive |
| - |
| -install-html-am: |
| +install-dvi-am: $(DVIS) |
| + @$(NORMAL_INSTALL) |
| + test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)" |
| + @list='$(DVIS)'; test -n "$(dvidir)" || list=; \ |
| + for p in $$list; do \ |
| + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| + echo "$$d$$p"; \ |
| + done | $(am__base_list) | \ |
| + while read files; do \ |
| + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \ |
| + $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \ |
| + done |
| +install-exec-am: install-libLTLIBRARIES |
| |
| +install-html-am: $(HTMLS) |
| + @$(NORMAL_INSTALL) |
| + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" |
| + @list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \ |
| + for p in $$list; do \ |
| + if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| + $(am__strip_dir) \ |
| + if test -d "$$d$$p"; then \ |
| + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ |
| + $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ |
| + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ |
| + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ |
| + else \ |
| + list2="$$list2 $$d$$p"; \ |
| + fi; \ |
| + done; \ |
| + test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ |
| + while read files; do \ |
| + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ |
| + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ |
| + done; } |
| install-info: install-info-recursive |
| |
| -install-info-am: |
| - |
| +install-info-am: $(INFO_DEPS) |
| + @$(NORMAL_INSTALL) |
| + test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)" |
| + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ |
| + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ |
| + for file in $$list; do \ |
| + case $$file in \ |
| + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ |
| + esac; \ |
| + if test -f $$file; then d=.; else d=$(srcdir); fi; \ |
| + file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ |
| + for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ |
| + $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ |
| + if test -f $$ifile; then \ |
| + echo "$$ifile"; \ |
| + else : ; fi; \ |
| + done; \ |
| + done | $(am__base_list) | \ |
| + while read files; do \ |
| + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ |
| + $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done |
| + @$(POST_INSTALL) |
| + @if (install-info --version && \ |
| + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ |
| + list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ |
| + for file in $$list; do \ |
| + relfile=`echo "$$file" | sed 's|^.*/||'`; \ |
| + echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\ |
| + install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ |
| + done; \ |
| + else : ; fi |
| install-man: |
| |
| -install-pdf: install-pdf-recursive |
| - |
| -install-pdf-am: |
| - |
| +install-pdf-am: $(PDFS) |
| + @$(NORMAL_INSTALL) |
| + test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)" |
| + @list='$(PDFS)'; test -n "$(pdfdir)" || list=; \ |
| + for p in $$list; do \ |
| + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| + echo "$$d$$p"; \ |
| + done | $(am__base_list) | \ |
| + while read files; do \ |
| + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \ |
| + $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done |
| install-ps: install-ps-recursive |
| |
| -install-ps-am: |
| - |
| +install-ps-am: $(PSS) |
| + @$(NORMAL_INSTALL) |
| + test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)" |
| + @list='$(PSS)'; test -n "$(psdir)" || list=; \ |
| + for p in $$list; do \ |
| + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| + echo "$$d$$p"; \ |
| + done | $(am__base_list) | \ |
| + while read files; do \ |
| + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ |
| + $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done |
| installcheck-am: |
| |
| -maintainer-clean: maintainer-clean-multi maintainer-clean-recursive |
| +maintainer-clean: maintainer-clean-recursive |
| -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
| -rm -rf $(top_srcdir)/autom4te.cache |
| - -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) |
| + -rm -rf src/$(DEPDIR) src/alpha/$(DEPDIR) src/arm/$(DEPDIR) src/avr32/$(DEPDIR) src/cris/$(DEPDIR) src/frv/$(DEPDIR) src/ia64/$(DEPDIR) src/m32r/$(DEPDIR) src/m68k/$(DEPDIR) src/mips/$(DEPDIR) src/moxie/$(DEPDIR) src/pa/$(DEPDIR) src/powerpc/$(DEPDIR) src/s390/$(DEPDIR) src/sh/$(DEPDIR) src/sh64/$(DEPDIR) src/sparc/$(DEPDIR) src/x86/$(DEPDIR) |
| -rm -f Makefile |
| -maintainer-clean-am: distclean-am maintainer-clean-generic |
| +maintainer-clean-am: distclean-am maintainer-clean-aminfo \ |
| + maintainer-clean-generic maintainer-clean-vti |
| |
| -mostlyclean: mostlyclean-multi mostlyclean-recursive |
| +mostlyclean: mostlyclean-recursive |
| |
| -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ |
| - mostlyclean-libtool |
| +mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ |
| + mostlyclean-generic mostlyclean-libtool mostlyclean-vti |
| |
| pdf: pdf-recursive |
| |
| -pdf-am: |
| +pdf-am: $(PDFS) |
| |
| ps: ps-recursive |
| |
| -ps-am: |
| +ps-am: $(PSS) |
| |
| -uninstall-am: uninstall-toolexeclibLTLIBRARIES |
| +uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ |
| + uninstall-libLTLIBRARIES uninstall-pdf-am \ |
| + uninstall-pkgconfigDATA uninstall-ps-am |
| |
| -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all all-multi \ |
| - clean-multi ctags-recursive distclean-multi install-am \ |
| - install-multi install-strip maintainer-clean-multi \ |
| - mostlyclean-multi tags-recursive |
| +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
| + ctags-recursive install-am install-strip tags-recursive |
| |
| .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
| - all all-am all-multi am--refresh check check-am clean \ |
| - clean-generic clean-libtool clean-multi \ |
| - clean-noinstLTLIBRARIES clean-toolexeclibLTLIBRARIES ctags \ |
| - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ |
| - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ |
| - distclean-compile distclean-generic distclean-hdr \ |
| - distclean-libtool distclean-multi distclean-tags \ |
| - distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
| - html-am info info-am install install-am install-data \ |
| - install-data-am install-dvi install-dvi-am install-exec \ |
| - install-exec-am install-html install-html-am install-info \ |
| - install-info-am install-man install-multi install-pdf \ |
| - install-pdf-am install-ps install-ps-am install-strip \ |
| - install-toolexeclibLTLIBRARIES installcheck installcheck-am \ |
| - installdirs installdirs-am maintainer-clean \ |
| - maintainer-clean-generic maintainer-clean-multi mostlyclean \ |
| + all all-am am--refresh check check-am clean clean-aminfo \ |
| + clean-generic clean-libLTLIBRARIES clean-libtool \ |
| + clean-noinstLTLIBRARIES ctags ctags-recursive dist dist-all \ |
| + dist-bzip2 dist-gzip dist-info dist-lzma dist-shar dist-tarZ \ |
| + dist-xz dist-zip distcheck distclean distclean-compile \ |
| + distclean-generic distclean-hdr distclean-libtool \ |
| + distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
| + dvi-am html html-am info info-am install install-am \ |
| + install-data install-data-am install-dvi install-dvi-am \ |
| + install-exec install-exec-am install-html install-html-am \ |
| + install-info install-info-am install-libLTLIBRARIES \ |
| + install-man install-pdf install-pdf-am install-pkgconfigDATA \ |
| + install-ps install-ps-am install-strip installcheck \ |
| + installcheck-am installdirs installdirs-am maintainer-clean \ |
| + maintainer-clean-aminfo maintainer-clean-generic \ |
| + maintainer-clean-vti mostlyclean mostlyclean-aminfo \ |
| mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
| - mostlyclean-multi pdf pdf-am ps ps-am tags tags-recursive \ |
| - uninstall uninstall-am uninstall-toolexeclibLTLIBRARIES |
| + mostlyclean-vti pdf pdf-am ps ps-am tags tags-recursive \ |
| + uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ |
| + uninstall-info-am uninstall-libLTLIBRARIES uninstall-pdf-am \ |
| + uninstall-pkgconfigDATA uninstall-ps-am |
| |
| |
| -# Multilib support. Automake should provide these on its own. |
| -all-recursive: all-multi |
| -install-recursive: install-multi |
| -mostlyclean-recursive: mostlyclean-multi |
| -clean-recursive: clean-multi |
| -distclean-recursive: distclean-multi |
| -maintainer-clean-recursive: maintainer-clean-multi |
| +# No install-html or install-pdf support in automake yet |
| +.PHONY: install-html install-pdf |
| +install-html: |
| +install-pdf: |
| |
| # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| # Otherwise a system limit (for SysV at least) may be exceeded. |
| Index: libffi/configure |
| =================================================================== |
| --- libffi.orig/configure |
| +++ libffi/configure |
| @@ -617,6 +617,8 @@ LTLIBOBJS |
| LIBOBJS |
| toolexeclibdir |
| toolexecdir |
| +FFI_DEBUG_FALSE |
| +FFI_DEBUG_TRUE |
| TARGETDIR |
| TARGET |
| HAVE_LONG_DOUBLE |
| @@ -3123,9 +3125,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am |
| # We must force CC to /not/ be precious variables; otherwise |
| # the wrong, non-multilib-adjusted value will be used in multilibs. |
| # As a side effect, we have to subst CFLAGS ourselves. |
| +# Also save and restore CFLAGS, since AC_PROG_CC will come up with |
| +# defaults of its own if none are provided. |
| |
| |
| |
| +save_CFLAGS=$CFLAGS |
| ac_ext=c |
| ac_cpp='$CPP $CPPFLAGS' |
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
| @@ -4105,6 +4110,7 @@ else |
| fi |
| |
| |
| +CFLAGS=$save_CFLAGS |
| |
| |
| |
| @@ -13344,6 +13350,14 @@ $as_echo "#define FFI_DEBUG 1" >>confdef |
| fi |
| fi |
| |
| + if test "$enable_debug" = "yes"; then |
| + FFI_DEBUG_TRUE= |
| + FFI_DEBUG_FALSE='#' |
| +else |
| + FFI_DEBUG_TRUE='#' |
| + FFI_DEBUG_FALSE= |
| +fi |
| + |
| |
| # Check whether --enable-structs was given. |
| if test "${enable_structs+set}" = set; then : |
| @@ -13658,6 +13672,10 @@ if test -z "${PA64_HPUX_TRUE}" && test - |
| Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| fi |
| |
| +if test -z "${FFI_DEBUG_TRUE}" && test -z "${FFI_DEBUG_FALSE}"; then |
| + as_fn_error $? "conditional \"FFI_DEBUG\" was never defined. |
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| +fi |
| |
| : "${CONFIG_STATUS=./config.status}" |
| ac_write_fail=0 |
