Index: Makefile.in =================================================================== --- Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -99,5 +99,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -266,4 +266,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@ Index: tomake/cfa.m4 =================================================================== --- automake/cfa.m4 (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ (revision ) @@ -1,99 +1,0 @@ - -m4_define([M4CFA_PARSE_PREFIX], [ - if test "x$prefix" = "xNONE"; then - cfa_prefix=${ac_default_prefix} - else - cfa_prefix=${prefix} - fi - cfa_prefix="$(readlink -m ${cfa_prefix})/" - AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.]) - AC_SUBST(CFA_PREFIX, ${cfa_prefix}) - - if test "$includedir" = '${prefix}/include'; then - cfa_incdir="${cfa_prefix}include/${cfa_name}" - else - cfa_incdir=${includedir} - fi - cfa_incdir="$(readlink -m ${cfa_incdir})/" - AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.]) - AC_SUBST(CFA_INCDIR, ${cfa_incdir}) - - if test "$bindir" = '${exec_prefix}/bin'; then - cfa_bindir="${cfa_prefix}bin" - else - cfa_bindir=${bindir} - fi - cfa_bindir="$(readlink -m ${cfa_bindir})/" - AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.]) - AC_SUBST(CFA_BINDIR, ${cfa_bindir}) - - if test "$libdir" = '${exec_prefix}/lib'; then - if test "${ARCHITECTURE}" != ""; then - cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/" - else - cfa_libdir="${cfa_prefix}lib/${cfa_name}/" - fi - else - cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}" - fi - cfa_libdir="$(readlink -m ${cfa_libdir})/" - AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.]) - AC_SUBST(CFA_LIBDIR, ${cfa_libdir}) -]) - -m4_define([M4CFA_PROGRAM_NAME], [ - if test "${program_transform_name}" = ""; then - AC_MSG_ERROR([Program transform not supported. - Use --with-cfa-name='[[Desired name here]]' instead]) - fi - - #Define the new name of the installed command - AC_ARG_WITH(cfa-name, - [ --with-cfa-name=NAME NAME too which cfa will be installed], - cfa_name=$withval, cfa_name="cfa") - - AC_SUBST(CFA_NAME, ${cfa_name}) -]) - -AC_DEFUN([M4CFA_CANNON_CPU], [ - case $1 in - "host") arch_name=${host_cpu};; - *) arch_name=$1;; - esac - - case $arch_name in - "x64" ) cannon_arch_name="x64";; - "x86-64" ) cannon_arch_name="x64";; - "x86_64" ) cannon_arch_name="x64";; - "aarch64" ) cannon_arch_name="arm";; - "x86" ) cannon_arch_name="x86";; - "i386" ) cannon_arch_name="x86";; - "i486" ) cannon_arch_name="x86";; - "i686" ) cannon_arch_name="x86";; - "Intel 80386") cannon_arch_name="x86";; - "arm" ) cannon_arch_name="arm";; - "ARM" ) cannon_arch_name="arm";; - "armv7l" ) cannon_arch_name="arm";; - *) - >&2 echo "Unknown architecture " $arch_name; - exit 1 - ;; - esac -]) - -# http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_check_compile_flag.m4 -AC_DEFUN([M4CFA_CHECK_COMPILE_FLAG], -[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF -AS_VAR_PUSHDEF([CACHEVAR],[m4cfa_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ - m4cfa_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS - _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" - AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], - [AS_VAR_SET(CACHEVAR,[yes])], - [AS_VAR_SET(CACHEVAR,[no])]) - _AC_LANG_PREFIX[]FLAGS=$m4cfa_check_save_flags]) -AS_VAR_IF(CACHEVAR,yes, - [m4_default([$2], :)], - [m4_default([$3], :)]) -AS_VAR_POPDEF([CACHEVAR])dnl -])dnl M4CFA_CHECK_COMPILE_FLAGS Index: benchmark/Makefile.am =================================================================== --- benchmark/Makefile.am (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ benchmark/Makefile.am (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -19,5 +19,5 @@ # applies to both programs -include $(top_srcdir)/src/cfa.make +@CFAMAKE@ AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror Index: benchmark/Makefile.in =================================================================== --- benchmark/Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ benchmark/Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -103,5 +103,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -197,5 +197,5 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp \ - $(top_srcdir)/src/cfa.make compile + compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -216,4 +216,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@ @@ -349,45 +350,4 @@ AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names ACLOCAL_AMFLAGS = -I automake -AM_T_CFA = $(am__t_CFA_@AM_T@) -am__t_CFA_ = -am__t_CFA_0 = -am__t_CFA_1 = /usr/bin/time --quiet -f "$@ %E" # trailling space is necessary -CFACOMPILE = $(AM_T_CFA)$(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCFACOMPILE = $(AM_T_CFA)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS) - -AM_V_CFA = $(am__v_CFA_@AM_V@) -am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@) -am__v_CFA_0 = @echo " CFA " $@; -am__v_CFA_1 = -UPPCC = u++ -UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_UPP = $(am__v_UPP_@AM_V@) -am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@) -am__v_UPP_0 = @echo " UPP " $@; -am__v_UPP_1 = -AM_V_GOC = $(am__v_GOC_@AM_V@) -am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@) -am__v_GOC_0 = @echo " GOC " $@; -am__v_GOC_1 = -AM_V_PY = $(am__v_PY_@AM_V@) -am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@) -am__v_PY_0 = @echo " PYTHON " $@; -am__v_PY_1 = -AM_V_RUST = $(am__v_RUST_@AM_V@) -am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@) -am__v_RUST_0 = @echo " RUST " $@; -am__v_RUST_1 = -AM_V_NODEJS = $(am__v_NODEJS_@AM_V@) -am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@) -am__v_NODEJS_0 = @echo " NODEJS " $@; -am__v_NODEJS_1 = -AM_V_JAVAC = $(am__v_JAVAC_@AM_V@) -am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@) -am__v_JAVAC_0 = @echo " JAVAC " $@; -am__v_JAVAC_1 = - -# applies to both programs AM_CFLAGS = -O2 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror AM_CFAFLAGS = -quiet -nodebug @@ -476,6 +436,6 @@ .SUFFIXES: -.SUFFIXES: .c .cfa .cpp .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps) +.SUFFIXES: .c .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -497,5 +457,4 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/cfa.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -779,13 +738,6 @@ -.cfa.o: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ - $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Po - -.cfa.lo: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ - $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Plo +# applies to both programs +@CFAMAKE@ dummyC.c: Index: configure =================================================================== --- configure (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ configure (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -753,4 +753,5 @@ INSTALL_SCRIPT INSTALL_PROGRAM +CFAMAKE AM_BACKSLASH AM_DEFAULT_VERBOSITY @@ -2555,4 +2556,6 @@ # http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_check_compile_flag.m4 + +CFAMAKE='include $(top_srcdir)/tools/build/cfa.make' Index: configure.ac =================================================================== --- configure.ac (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ configure.ac (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -10,5 +10,7 @@ AM_SILENT_RULES([yes]) -m4_include([automake/cfa.m4]) +m4_include([tools/build/cfa.m4]) +CFAMAKE='include $(top_srcdir)/tools/build/cfa.make' +AC_SUBST([CFAMAKE]) # don't use the default CFLAGS as they unconditonnaly add -O2 Index: driver/Makefile.in =================================================================== --- driver/Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ driver/Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -101,5 +101,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -203,4 +203,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@ Index: libcfa/configure.ac =================================================================== --- libcfa/configure.ac (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ libcfa/configure.ac (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -8,5 +8,7 @@ AM_SILENT_RULES([yes]) -m4_include([../automake/cfa.m4]) +m4_include([../build/tools/cfa.m4]) +CFAMAKE='include $(top_srcdir)/../tools/build/cfa.make' +AC_SUBST([CFAMAKE]) AM_INIT_AUTOMAKE([subdir-objects]) Index: libcfa/src/Makefile.am =================================================================== --- libcfa/src/Makefile.am (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ libcfa/src/Makefile.am (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -19,5 +19,5 @@ ACLOCAL_AMFLAGS = -I automake -include $(srcdir)/../../src/cfa.make +@CFAMAKE@ libdir = ${CFA_LIBDIR} Index: longrun_tests/Makefile.am =================================================================== --- longrun_tests/Makefile.am (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ longrun_tests/Makefile.am (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -18,5 +18,5 @@ ACLOCAL_AMFLAGS = -I automake -include $(top_srcdir)/src/cfa.make +@CFAMAKE@ repeats=10 Index: longrun_tests/Makefile.in =================================================================== --- longrun_tests/Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ longrun_tests/Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -98,5 +98,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -331,5 +331,5 @@ $(TEST_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/automake/test-driver $(top_srcdir)/src/cfa.make + $(top_srcdir)/automake/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -350,4 +350,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@ @@ -483,43 +484,4 @@ AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names ACLOCAL_AMFLAGS = -I automake -AM_T_CFA = $(am__t_CFA_@AM_T@) -am__t_CFA_ = -am__t_CFA_0 = -am__t_CFA_1 = /usr/bin/time --quiet -f "$@ %E" # trailling space is necessary -CFACOMPILE = $(AM_T_CFA)$(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCFACOMPILE = $(AM_T_CFA)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS) - -AM_V_CFA = $(am__v_CFA_@AM_V@) -am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@) -am__v_CFA_0 = @echo " CFA " $@; -am__v_CFA_1 = -UPPCC = u++ -UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_UPP = $(am__v_UPP_@AM_V@) -am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@) -am__v_UPP_0 = @echo " UPP " $@; -am__v_UPP_1 = -AM_V_GOC = $(am__v_GOC_@AM_V@) -am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@) -am__v_GOC_0 = @echo " GOC " $@; -am__v_GOC_1 = -AM_V_PY = $(am__v_PY_@AM_V@) -am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@) -am__v_PY_0 = @echo " PYTHON " $@; -am__v_PY_1 = -AM_V_RUST = $(am__v_RUST_@AM_V@) -am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@) -am__v_RUST_0 = @echo " RUST " $@; -am__v_RUST_1 = -AM_V_NODEJS = $(am__v_NODEJS_@AM_V@) -am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@) -am__v_NODEJS_0 = @echo " NODEJS " $@; -am__v_NODEJS_1 = -AM_V_JAVAC = $(am__v_JAVAC_@AM_V@) -am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@) -am__v_JAVAC_0 = @echo " JAVAC " $@; -am__v_JAVAC_1 = repeats = 10 max_time = 600 @@ -547,6 +509,6 @@ .SUFFIXES: -.SUFFIXES: .cfa .lo .log .o .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps) +.SUFFIXES: .log .test .test$(EXEEXT) .trs +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -568,5 +530,4 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/cfa.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -969,13 +930,5 @@ -.cfa.o: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ - $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Po - -.cfa.lo: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ - $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Plo +@CFAMAKE@ # .INTERMEDIATE: $(TESTS) Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ src/Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -150,5 +150,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -413,4 +413,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@ Index: c/cfa.make =================================================================== --- src/cfa.make (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ (revision ) @@ -1,58 +1,0 @@ -AM_T_CFA = $(am__t_CFA_@AM_T@) -am__t_CFA_ = -am__t_CFA_0 = -am__t_CFA_1 = /usr/bin/time --quiet -f "$@ %E" # trailling space is necessary - - -CFACOMPILE = $(AM_T_CFA)$(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCFACOMPILE = $(AM_T_CFA)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS) - -AM_V_CFA = $(am__v_CFA_@AM_V@) -am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@) -am__v_CFA_0 = @echo " CFA " $@; -am__v_CFA_1 = - -.cfa.o: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ - $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Po - -.cfa.lo: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ - $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Plo - -UPPCC = u++ -UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS) - -AM_V_UPP = $(am__v_UPP_@AM_V@) -am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@) -am__v_UPP_0 = @echo " UPP " $@; -am__v_UPP_1 = - -AM_V_GOC = $(am__v_GOC_@AM_V@) -am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@) -am__v_GOC_0 = @echo " GOC " $@; -am__v_GOC_1 = - -AM_V_PY = $(am__v_PY_@AM_V@) -am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@) -am__v_PY_0 = @echo " PYTHON " $@; -am__v_PY_1 = - -AM_V_RUST = $(am__v_RUST_@AM_V@) -am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@) -am__v_RUST_0 = @echo " RUST " $@; -am__v_RUST_1 = - -AM_V_NODEJS = $(am__v_NODEJS_@AM_V@) -am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@) -am__v_NODEJS_0 = @echo " NODEJS " $@; -am__v_NODEJS_1 = - -AM_V_JAVAC = $(am__v_JAVAC_@AM_V@) -am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@) -am__v_JAVAC_0 = @echo " JAVAC " $@; -am__v_JAVAC_1 = Index: tests/Makefile.am =================================================================== --- tests/Makefile.am (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ tests/Makefile.am (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -18,5 +18,5 @@ ACLOCAL_AMFLAGS = -I automake -include $(top_srcdir)/src/cfa.make +@CFAMAKE@ DEFAULT_INCLUDES = -I${abs_srcdir} Index: tests/Makefile.in =================================================================== --- tests/Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ tests/Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -99,5 +99,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -114,9 +114,5 @@ am__v_lt_0 = --silent am__v_lt_1 = -am__dirstamp = $(am__leading_dot)dirstamp -am_avl_test_OBJECTS = avltree/avl_test.$(OBJEXT) \ - avltree/avl0.$(OBJEXT) avltree/avl1.$(OBJEXT) \ - avltree/avl2.$(OBJEXT) avltree/avl3.$(OBJEXT) \ - avltree/avl4.$(OBJEXT) avltree/avl-private.$(OBJEXT) +am_avl_test_OBJECTS = avl_test_OBJECTS = $(am_avl_test_OBJECTS) avl_test_LDADD = $(LDADD) @@ -199,6 +195,5 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.py.in \ - $(srcdir)/test.py $(top_srcdir)/automake/depcomp \ - $(top_srcdir)/src/cfa.make + $(srcdir)/test.py $(top_srcdir)/automake/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -221,4 +216,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@ @@ -354,43 +350,4 @@ AUTOMAKE_OPTIONS = foreign # do not require all the GNU file names ACLOCAL_AMFLAGS = -I automake -AM_T_CFA = $(am__t_CFA_@AM_T@) -am__t_CFA_ = -am__t_CFA_0 = -am__t_CFA_1 = /usr/bin/time --quiet -f "$@ %E" # trailling space is necessary -CFACOMPILE = $(AM_T_CFA)$(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCFACOMPILE = $(AM_T_CFA)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS) - -AM_V_CFA = $(am__v_CFA_@AM_V@) -am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@) -am__v_CFA_0 = @echo " CFA " $@; -am__v_CFA_1 = -UPPCC = u++ -UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS) -AM_V_UPP = $(am__v_UPP_@AM_V@) -am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@) -am__v_UPP_0 = @echo " UPP " $@; -am__v_UPP_1 = -AM_V_GOC = $(am__v_GOC_@AM_V@) -am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@) -am__v_GOC_0 = @echo " GOC " $@; -am__v_GOC_1 = -AM_V_PY = $(am__v_PY_@AM_V@) -am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@) -am__v_PY_0 = @echo " PYTHON " $@; -am__v_PY_1 = -AM_V_RUST = $(am__v_RUST_@AM_V@) -am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@) -am__v_RUST_0 = @echo " RUST " $@; -am__v_RUST_1 = -AM_V_NODEJS = $(am__v_NODEJS_@AM_V@) -am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@) -am__v_NODEJS_0 = @echo " NODEJS " $@; -am__v_NODEJS_1 = -AM_V_JAVAC = $(am__v_JAVAC_@AM_V@) -am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@) -am__v_JAVAC_0 = @echo " JAVAC " $@; -am__v_JAVAC_1 = DEFAULT_INCLUDES = -I${abs_srcdir} debug = yes @@ -448,5 +405,5 @@ .SUFFIXES: .SUFFIXES: .c .cfa .cpp .dummy_hack .dummy_hackxx .lo .o .obj .validate -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -468,5 +425,4 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/src/cfa.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -484,24 +440,4 @@ @rm -f .dummy_hack$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(_dummy_hack_OBJECTS) $(_dummy_hack_LDADD) $(LIBS) -avltree/$(am__dirstamp): - @$(MKDIR_P) avltree - @: > avltree/$(am__dirstamp) -avltree/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) avltree/$(DEPDIR) - @: > avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test.$(OBJEXT): avltree/$(am__dirstamp) \ - avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl0.$(OBJEXT): avltree/$(am__dirstamp) \ - avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl1.$(OBJEXT): avltree/$(am__dirstamp) \ - avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl2.$(OBJEXT): avltree/$(am__dirstamp) \ - avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl3.$(OBJEXT): avltree/$(am__dirstamp) \ - avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl4.$(OBJEXT): avltree/$(am__dirstamp) \ - avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl-private.$(OBJEXT): avltree/$(am__dirstamp) \ - avltree/$(DEPDIR)/$(am__dirstamp) avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES) @@ -511,5 +447,4 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f avltree/*.$(OBJEXT) distclean-compile: @@ -685,6 +620,4 @@ -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 avltree/$(DEPDIR)/$(am__dirstamp) - -rm -f avltree/$(am__dirstamp) maintainer-clean-generic: @@ -780,13 +713,5 @@ -.cfa.o: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ - $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Po - -.cfa.lo: - $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ - $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ - $(am__mv) $$depbase.Tpo $$depbase.Plo +@CFAMAKE@ .PHONY: list .validate Index: tools/Makefile.in =================================================================== --- tools/Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ tools/Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -101,5 +101,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -210,4 +210,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@ Index: tools/build/cfa.m4 =================================================================== --- tools/build/cfa.m4 (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) +++ tools/build/cfa.m4 (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -0,0 +1,99 @@ + +m4_define([M4CFA_PARSE_PREFIX], [ + if test "x$prefix" = "xNONE"; then + cfa_prefix=${ac_default_prefix} + else + cfa_prefix=${prefix} + fi + cfa_prefix="$(readlink -m ${cfa_prefix})/" + AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.]) + AC_SUBST(CFA_PREFIX, ${cfa_prefix}) + + if test "$includedir" = '${prefix}/include'; then + cfa_incdir="${cfa_prefix}include/${cfa_name}" + else + cfa_incdir=${includedir} + fi + cfa_incdir="$(readlink -m ${cfa_incdir})/" + AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.]) + AC_SUBST(CFA_INCDIR, ${cfa_incdir}) + + if test "$bindir" = '${exec_prefix}/bin'; then + cfa_bindir="${cfa_prefix}bin" + else + cfa_bindir=${bindir} + fi + cfa_bindir="$(readlink -m ${cfa_bindir})/" + AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.]) + AC_SUBST(CFA_BINDIR, ${cfa_bindir}) + + if test "$libdir" = '${exec_prefix}/lib'; then + if test "${ARCHITECTURE}" != ""; then + cfa_libdir="${cfa_prefix}lib/${cfa_name}/${ARCHITECTURE}-${CONFIGURATION}/" + else + cfa_libdir="${cfa_prefix}lib/${cfa_name}/" + fi + else + cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}" + fi + cfa_libdir="$(readlink -m ${cfa_libdir})/" + AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.]) + AC_SUBST(CFA_LIBDIR, ${cfa_libdir}) +]) + +m4_define([M4CFA_PROGRAM_NAME], [ + if test "${program_transform_name}" = ""; then + AC_MSG_ERROR([Program transform not supported. + Use --with-cfa-name='[[Desired name here]]' instead]) + fi + + #Define the new name of the installed command + AC_ARG_WITH(cfa-name, + [ --with-cfa-name=NAME NAME too which cfa will be installed], + cfa_name=$withval, cfa_name="cfa") + + AC_SUBST(CFA_NAME, ${cfa_name}) +]) + +AC_DEFUN([M4CFA_CANNON_CPU], [ + case $1 in + "host") arch_name=${host_cpu};; + *) arch_name=$1;; + esac + + case $arch_name in + "x64" ) cannon_arch_name="x64";; + "x86-64" ) cannon_arch_name="x64";; + "x86_64" ) cannon_arch_name="x64";; + "aarch64" ) cannon_arch_name="arm";; + "x86" ) cannon_arch_name="x86";; + "i386" ) cannon_arch_name="x86";; + "i486" ) cannon_arch_name="x86";; + "i686" ) cannon_arch_name="x86";; + "Intel 80386") cannon_arch_name="x86";; + "arm" ) cannon_arch_name="arm";; + "ARM" ) cannon_arch_name="arm";; + "armv7l" ) cannon_arch_name="arm";; + *) + >&2 echo "Unknown architecture " $arch_name; + exit 1 + ;; + esac +]) + +# http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_check_compile_flag.m4 +AC_DEFUN([M4CFA_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[m4cfa_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + m4cfa_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$m4cfa_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl M4CFA_CHECK_COMPILE_FLAGS Index: tools/build/cfa.make =================================================================== --- tools/build/cfa.make (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) +++ tools/build/cfa.make (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -0,0 +1,58 @@ +AM_T_CFA = $(am__t_CFA_@AM_T@) +am__t_CFA_ = +am__t_CFA_0 = +am__t_CFA_1 = /usr/bin/time --quiet -f "$@ %E" # trailling space is necessary + + +CFACOMPILE = $(AM_T_CFA)$(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCFACOMPILE = $(AM_T_CFA)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(AM_CFLAGS) $(CFAFLAGS) $(CFLAGS) + +AM_V_CFA = $(am__v_CFA_@AM_V@) +am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@) +am__v_CFA_0 = @echo " CFA " $@; +am__v_CFA_1 = + +.cfa.o: + $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ + $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ + $(am__mv) $$depbase.Tpo $$depbase.Po + +.cfa.lo: + $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ + $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ + $(am__mv) $$depbase.Tpo $$depbase.Plo + +UPPCC = u++ +UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS) + +AM_V_UPP = $(am__v_UPP_@AM_V@) +am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@) +am__v_UPP_0 = @echo " UPP " $@; +am__v_UPP_1 = + +AM_V_GOC = $(am__v_GOC_@AM_V@) +am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@) +am__v_GOC_0 = @echo " GOC " $@; +am__v_GOC_1 = + +AM_V_PY = $(am__v_PY_@AM_V@) +am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@) +am__v_PY_0 = @echo " PYTHON " $@; +am__v_PY_1 = + +AM_V_RUST = $(am__v_RUST_@AM_V@) +am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@) +am__v_RUST_0 = @echo " RUST " $@; +am__v_RUST_1 = + +AM_V_NODEJS = $(am__v_NODEJS_@AM_V@) +am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@) +am__v_NODEJS_0 = @echo " NODEJS " $@; +am__v_NODEJS_1 = + +AM_V_JAVAC = $(am__v_JAVAC_@AM_V@) +am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@) +am__v_JAVAC_0 = @echo " JAVAC " $@; +am__v_JAVAC_1 = Index: tools/prettyprinter/Makefile.in =================================================================== --- tools/prettyprinter/Makefile.in (revision c1f38e6cb761f0c262410a4cbc49bf127a2918c4) +++ tools/prettyprinter/Makefile.in (revision 0c30ecc5ea7a75e702bd47070432649f203cad0d) @@ -100,5 +100,5 @@ $(top_srcdir)/automake/ltversion.m4 \ $(top_srcdir)/automake/lt~obsolete.m4 \ - $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -239,4 +239,5 @@ CFACC_INSTALL = @CFACC_INSTALL@ CFACPP = @CFACPP@ +CFAMAKE = @CFAMAKE@ CFA_BACKEND_CC = @CFA_BACKEND_CC@ CFA_BINDIR = @CFA_BINDIR@