# HG changeset patch # User Rik # Date 1358463556 28800 # Node ID e9f6c773332ce5623f0ca06b4e6962366a85c7e5 # Parent bde7731b2b835d3d678c2e37de0dbbf48a831dff Fix build exceeding shell input line length. * build-aux/common.mk(do_subst_config_val): Put patterns for replacement in separate Perl file. * build-aux/config_vals.pl: New Perl file to substitute configuration values with values from the Make environment. diff -r bde7731b2b83 -r e9f6c773332c build-aux/common.mk --- a/build-aux/common.mk Mon Jan 14 21:01:49 2013 +0100 +++ b/build-aux/common.mk Thu Jan 17 14:59:16 2013 -0800 @@ -472,168 +472,7 @@ define do_subst_config_vals echo "making $@ from $<" -$(SED) < $< \ - -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically from $( $@-t +$(PERL) -p $(top_srcdir)/build-aux/config_vals.pl $< > $@-t $(simple_move_if_change_rule) endef diff -r bde7731b2b83 -r e9f6c773332c build-aux/config_vals.pl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build-aux/config_vals.pl Thu Jan 17 14:59:16 2013 -0800 @@ -0,0 +1,171 @@ +#!/usr/bin/perl -p + +## Extract source file name from input file +BEGIN { + $srcfile = $ARGV[0]; + $srcfile =~ s#^.*(/|\\)##; +} + +## List of config value substitutions + +s[%NO_EDIT_WARNING%][DO NOT EDIT! Generated automatically from ${srcfile} by Make.]; +s[%NO_OCT_FILE_STRIP%]["$ENV{NO_OCT_FILE_STRIP}"]; +s[%OCTAVE_BINDIR%]["$ENV{bindir}"]; +s[%OCTAVE_CONF_ALL_CFLAGS%]["$ENV{ALL_CFLAGS}"]; +s[%OCTAVE_CONF_ALL_CXXFLAGS%]["$ENV{ALL_CXXFLAGS}"]; +s[%OCTAVE_CONF_ALL_FFLAGS%]["$ENV{ALL_FFLAGS}"]; +s[%OCTAVE_CONF_ALL_LDFLAGS%]["$ENV{ALL_LDFLAGS}"]; +s[%OCTAVE_CONF_AMD_CPPFLAGS%]["$ENV{AMD_CPPFLAGS}"]; +s[%OCTAVE_CONF_AMD_LDFLAGS%]["$ENV{AMD_LDFLAGS}"]; +s[%OCTAVE_CONF_AMD_LIBS%]["$ENV{AMD_LIBS}"]; +s[%OCTAVE_CONF_AR%]["$ENV{AR}"]; +s[%OCTAVE_CONF_ARFLAGS%]["$ENV{ARFLAGS}"]; +s[%OCTAVE_CONF_ARPACK_CPPFLAGS%]["$ENV{ARPACK_CPPFLAGS}"]; +s[%OCTAVE_CONF_ARPACK_LDFLAGS%]["$ENV{ARPACK_LDFLAGS}"]; +s[%OCTAVE_CONF_ARPACK_LIBS%]["$ENV{ARPACK_LIBS}"]; +s[%OCTAVE_CONF_BLAS_LIBS%]["$ENV{BLAS_LIBS}"]; +s[%OCTAVE_CONF_CAMD_CPPFLAGS%]["$ENV{CAMD_CPPFLAGS}"]; +s[%OCTAVE_CONF_CAMD_LDFLAGS%]["$ENV{CAMD_LDFLAGS}"]; +s[%OCTAVE_CONF_CAMD_LIBS%]["$ENV{CAMD_LIBS}"]; +s[%OCTAVE_CONF_CANONICAL_HOST_TYPE%]["$ENV{canonical_host_type}"]; +s[%OCTAVE_CONF_CARBON_LIBS%]["$ENV{CARBON_LIBS}"]; +s[%OCTAVE_CONF_CC%]["$ENV{CC}"]; +s[%OCTAVE_CONF_CC_VERSION%]["$ENV{CC_VERSION}"]; +s[%OCTAVE_CONF_CCOLAMD_CPPFLAGS%]["$ENV{CCOLAMD_CPPFLAGS}"]; +s[%OCTAVE_CONF_CCOLAMD_LDFLAGS%]["$ENV{CCOLAMD_LDFLAGS}"]; +s[%OCTAVE_CONF_CCOLAMD_LIBS%]["$ENV{CCOLAMD_LIBS}"]; +s[%OCTAVE_CONF_CFLAGS%]["$ENV{CFLAGS}"]; +s[%OCTAVE_CONF_CHOLMOD_CPPFLAGS%]["$ENV{CHOLMOD_CPPFLAGS}"]; +s[%OCTAVE_CONF_CHOLMOD_LDFLAGS%]["$ENV{CHOLMOD_LDFLAGS}"]; +s[%OCTAVE_CONF_CHOLMOD_LIBS%]["$ENV{CHOLMOD_LIBS}"]; +s[%OCTAVE_CONF_COLAMD_CPPFLAGS%]["$ENV{COLAMD_CPPFLAGS}"]; +s[%OCTAVE_CONF_COLAMD_LDFLAGS%]["$ENV{COLAMD_LDFLAGS}"]; +s[%OCTAVE_CONF_COLAMD_LIBS%]["$ENV{COLAMD_LIBS}"]; +s[%OCTAVE_CONF_CPICFLAG%]["$ENV{CPICFLAG}"]; +s[%OCTAVE_CONF_CPPFLAGS%]["$ENV{CPPFLAGS}"]; +s[%OCTAVE_CONF_CURL_CPPFLAGS%]["$ENV{CURL_CPPFLAGS}"]; +s[%OCTAVE_CONF_CURL_LDFLAGS%]["$ENV{CURL_LDFLAGS}"]; +s[%OCTAVE_CONF_CURL_LIBS%]["$ENV{CURL_LIBS}"]; +s[%OCTAVE_CONF_CXSPARSE_CPPFLAGS%]["$ENV{CXSPARSE_CPPFLAGS}"]; +s[%OCTAVE_CONF_CXSPARSE_LDFLAGS%]["$ENV{CXSPARSE_LDFLAGS}"]; +s[%OCTAVE_CONF_CXSPARSE_LIBS%]["$ENV{CXSPARSE_LIBS}"]; +s[%OCTAVE_CONF_CXX%]["$ENV{CXX}"]; +s[%OCTAVE_CONF_CXXCPP%]["$ENV{CXXCPP}"]; +s[%OCTAVE_CONF_CXXFLAGS%]["$ENV{CXXFLAGS}"]; +s[%OCTAVE_CONF_CXXPICFLAG%]["$ENV{CXXPICFLAG}"]; +s[%OCTAVE_CONF_CXX_VERSION%]["$ENV{CXX_VERSION}"]; +s[%OCTAVE_CONF_DEFAULT_PAGER%]["$ENV{DEFAULT_PAGER}"]; +s[%OCTAVE_CONF_DEFS%]["$ENV{UGLY_DEFS}"]; +s[%OCTAVE_CONF_DEPEND_FLAGS%]["$ENV{DEPEND_FLAGS}"]; +s[%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%]["$ENV{DEPEND_EXTRA_SED_PATTERN}"]; +s[%OCTAVE_CONF_DL_LD%]["$ENV{DL_LD}"]; +s[%OCTAVE_CONF_DL_LDFLAGS%]["$ENV{DL_LDFLAGS}"]; +s[%OCTAVE_CONF_DL_LIBS%]["$ENV{DL_LIBS}"]; +s[%OCTAVE_CONF_ENABLE_DYNAMIC_LINKING%]["$ENV{ENABLE_DYNAMIC_LINKING}"]; +s[%OCTAVE_CONF_EXEEXT%]["$ENV{EXEEXT}"]; +s[%OCTAVE_CONF_GCC_VERSION%]["$ENV{GCC_VERSION}"]; +s[%OCTAVE_CONF_GXX_VERSION%]["$ENV{GXX_VERSION}"]; +s[%OCTAVE_CONF_F77%]["$ENV{F77}"]; +s[%OCTAVE_CONF_F77_FLOAT_STORE_FLAG%]["$ENV{F77_FLOAT_STORE_FLAG}"]; +s[%OCTAVE_CONF_F77_INTEGER_8_FLAG%]["$ENV{F77_INTEGER_8_FLAG}"]; +s[%OCTAVE_CONF_FC%]["$ENV{FC}"]; +s[%OCTAVE_CONF_FFLAGS%]["$ENV{FFLAGS}"]; +s[%OCTAVE_CONF_FFTW3_CPPFLAGS%]["$ENV{FFTW3_CPPFLAGS}"]; +s[%OCTAVE_CONF_FFTW3_LDFLAGS%]["$ENV{FFTW3_LDFLAGS}"]; +s[%OCTAVE_CONF_FFTW3_LIBS%]["$ENV{FFTW3_LIBS}"]; +s[%OCTAVE_CONF_FFTW3F_CPPFLAGS%]["$ENV{FFTW3F_CPPFLAGS}"]; +s[%OCTAVE_CONF_FFTW3F_LDFLAGS%]["$ENV{FFTW3F_LDFLAGS}"]; +s[%OCTAVE_CONF_FFTW3F_LIBS%]["$ENV{FFTW3F_LIBS}"]; +s[%OCTAVE_CONF_FLIBS%]["$ENV{FLIBS}"]; +s[%OCTAVE_CONF_FPICFLAG%]["$ENV{FPICFLAG}"]; +s[%OCTAVE_CONF_FT2_CFLAGS%]["$ENV{FT2_CFLAGS}"]; +s[%OCTAVE_CONF_FT2_LIBS%]["$ENV{FT2_LIBS}"]; +s[%OCTAVE_CONF_GLPK_CPPFLAGS%]["$ENV{GLPK_CPPFLAGS}"]; +s[%OCTAVE_CONF_GLPK_LDFLAGS%]["$ENV{GLPK_LDFLAGS}"]; +s[%OCTAVE_CONF_GLPK_LIBS%]["$ENV{GLPK_LIBS}"]; +s[%OCTAVE_CONF_GNUPLOT%]["$ENV{GNUPLOT}"]; +s[%OCTAVE_CONF_GRAPHICS_CFLAGS%]["$ENV{GRAPHICS_CFLAGS}"]; +s[%OCTAVE_CONF_GRAPHICS_LIBS%]["$ENV{GRAPHICS_LIBS}"]; +s[%OCTAVE_CONF_HDF5_CPPFLAGS%]["$ENV{HDF5_CPPFLAGS}"]; +s[%OCTAVE_CONF_HDF5_LDFLAGS%]["$ENV{HDF5_LDFLAGS}"]; +s[%OCTAVE_CONF_HDF5_LIBS%]["$ENV{HDF5_LIBS}"]; +s[%OCTAVE_CONF_INCLUDEDIR%]["$ENV{includedir}"]; +s[%OCTAVE_CONF_LAPACK_LIBS%]["$ENV{LAPACK_LIBS}"]; +s[%OCTAVE_CONF_LD_CXX%]["$ENV{LD_CXX}"]; +s[%OCTAVE_CONF_LDFLAGS%]["$ENV{LDFLAGS}"]; +s[%OCTAVE_CONF_LD_STATIC_FLAG%]["$ENV{LD_STATIC_FLAG}"]; +s[%OCTAVE_CONF_LEX%]["$ENV{LEX}"]; +s[%OCTAVE_CONF_LEXLIB%]["$ENV{LEXLIB}"]; +s[%OCTAVE_CONF_LFLAGS%]["$ENV{LFLAGS}"]; +s[%OCTAVE_CONF_LIBDIR%]["$ENV{libdir}"]; +s[%OCTAVE_CONF_LIBEXT%]["$ENV{LIBEXT}"]; +s[%OCTAVE_CONF_LIBFLAGS%]["$ENV{LIBFLAGS}"]; +s[%OCTAVE_CONF_LIBOCTAVE%]["$ENV{LIBOCTAVE}"]; +s[%OCTAVE_CONF_LIBOCTINTERP%]["$ENV{LIBOCTINTERP}"]; +s[%OCTAVE_CONF_LIBS%]["$ENV{LIBS}"]; +s[%OCTAVE_CONF_LLVM_CPPFLAGS%]["$ENV{LLVM_CPPFLAGS}"]; +s[%OCTAVE_CONF_LLVM_LDFLAGS%]["$ENV{LLVM_LDFLAGS}"]; +s[%OCTAVE_CONF_LLVM_LIBS%]["$ENV{LLVM_LIBS}"]; +s[%OCTAVE_CONF_LN_S%]["$ENV{LN_S}"]; +s[%OCTAVE_CONF_MAGICK_CPPFLAGS%]["$ENV{MAGICK_CPPFLAGS}"]; +s[%OCTAVE_CONF_MAGICK_LDFLAGS%]["$ENV{MAGICK_LDFLAGS}"]; +s[%OCTAVE_CONF_MAGICK_LIBS%]["$ENV{MAGICK_LIBS}"]; +s[%OCTAVE_CONF_MKOCTFILE_AR%]["$ENV{MKOCTFILE_AR}"]; +s[%OCTAVE_CONF_MKOCTFILE_CC%]["$ENV{MKOCTFILE_CC}"]; +s[%OCTAVE_CONF_MKOCTFILE_CXX%]["$ENV{MKOCTFILE_CXX}"]; +s[%OCTAVE_CONF_MKOCTFILE_DL_LD%]["$ENV{MKOCTFILE_DL_LD}"]; +s[%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%]["$ENV{MKOCTFILE_DL_LDFLAGS}"]; +s[%OCTAVE_CONF_MKOCTFILE_F77%]["$ENV{MKOCTFILE_F77}"]; +s[%OCTAVE_CONF_MKOCTFILE_LD_CXX%]["$ENV{MKOCTFILE_LD_CXX}"]; +s[%OCTAVE_CONF_MKOCTFILE_RANLIB%]["$ENV{MKOCTFILE_RANLIB}"]; +s[%OCTAVE_CONF_OCTAVE_LINK_DEPS%]["$ENV{OCTAVE_LINK_DEPS}"]; +s[%OCTAVE_CONF_OCTAVE_LINK_OPTS%]["$ENV{OCTAVE_LINK_OPTS}"]; +s[%OCTAVE_CONF_OCTINCLUDEDIR%]["$ENV{octincludedir}"]; +s[%OCTAVE_CONF_OCTLIBDIR%]["$ENV{octlibdir}"]; +s[%OCTAVE_CONF_OCT_LINK_DEPS%]["$ENV{OCT_LINK_DEPS}"]; +s[%OCTAVE_CONF_OCT_LINK_OPTS%]["$ENV{OCT_LINK_OPTS}"]; +s[%OCTAVE_CONF_OPENGL_LIBS%]["$ENV{OPENGL_LIBS}"]; +s[%OCTAVE_CONF_PREFIX%]["$ENV{prefix}"]; +s[%OCTAVE_CONF_PTHREAD_CFLAGS%]["$ENV{PTHREAD_CFLAGS}"]; +s[%OCTAVE_CONF_PTHREAD_LIBS%]["$ENV{PTHREAD_LIBS}"]; +s[%OCTAVE_CONF_QHULL_CPPFLAGS%]["$ENV{QHULL_CPPFLAGSS}"]; +s[%OCTAVE_CONF_QHULL_LDFLAGS%]["$ENV{QHULL_LDFLAGSS}"]; +s[%OCTAVE_CONF_QHULL_LIBS%]["$ENV{QHULL_LIBS}"]; +s[%OCTAVE_CONF_QRUPDATE_CPPFLAGS%]["$ENV{QRUPDATE_CPPFLAGS}"]; +s[%OCTAVE_CONF_QRUPDATE_LDFLAGS%]["$ENV{QRUPDATE_LDFLAGS}"]; +s[%OCTAVE_CONF_QRUPDATE_LIBS%]["$ENV{QRUPDATE_LIBS}"]; +s[%OCTAVE_CONF_QT_CPPFLAGS%]["$ENV{QT_CPPFLAGS}"]; +s[%OCTAVE_CONF_QT_LDFLAGS%]["$ENV{QT_LDFLAGS}"]; +s[%OCTAVE_CONF_QT_LIBS%]["$ENV{QT_LIBS}"]; +s[%OCTAVE_CONF_RANLIB%]["$ENV{RANLIB}"]; +s[%OCTAVE_CONF_RDYNAMIC_FLAG%]["$ENV{RDYNAMIC_FLAG}"]; +s[%OCTAVE_CONF_READLINE_LIBS%]["$ENV{READLINE_LIBS}"]; +s[%OCTAVE_CONF_REGEX_LIBS%]["$ENV{REGEX_LIBS}"]; +s[%OCTAVE_CONF_SED%]["$ENV{SED}"]; +s[%OCTAVE_CONF_SHARED_LIBS%]["$ENV{SHARED_LIBS}"]; +s[%OCTAVE_CONF_SHLEXT%]["$ENV{SHLEXT}"]; +s[%OCTAVE_CONF_SHLLINKEXT%]["$ENV{SHLLINKEXT}"]; +s[%OCTAVE_CONF_SHLEXT_VER%]["$ENV{SHLEXT_VER}"]; +s[%OCTAVE_CONF_SH_LD%]["$ENV{SH_LD}"]; +s[%OCTAVE_CONF_SH_LDFLAGS%]["$ENV{SH_LDFLAGS}"]; +s[%OCTAVE_CONF_SONAME_FLAGS%]["$ENV{SONAME_FLAGS}"]; +s[%OCTAVE_CONF_STATIC_LIBS%]["$ENV{STATIC_LIBS}"]; +s[%OCTAVE_CONF_TERM_LIBS%]["$ENV{TERM_LIBS}"]; +s[%OCTAVE_CONF_UGLY_DEFS%]["$ENV{UGLY_DEFS}"]; +s[%OCTAVE_CONF_UMFPACK_CPPFLAGS%]["$ENV{UMFPACK_CPPFLAGS}"]; +s[%OCTAVE_CONF_UMFPACK_LDFLAGS%]["$ENV{UMFPACK_LDFLAGS}"]; +s[%OCTAVE_CONF_UMFPACK_LIBS%]["$ENV{UMFPACK_LIBS}"]; +s[%OCTAVE_CONF_USE_64_BIT_IDX_T%]["$ENV{USE_64_BIT_IDX_T}"]; +s[%OCTAVE_CONF_VERSION%]["$ENV{version}"]; +s[%OCTAVE_CONF_WARN_CFLAGS%]["$ENV{WARN_CFLAGS}"]; +s[%OCTAVE_CONF_WARN_CXXFLAGS%]["$ENV{WARN_CXXFLAGS}"]; +s[%OCTAVE_CONF_X11_INCFLAGS%]["$ENV{X11_INCFLAGS}"]; +s[%OCTAVE_CONF_X11_LIBS%]["$ENV{X11_LIBS}"]; +s[%OCTAVE_CONF_XTRA_CFLAGS%]["$ENV{XTRA_CFLAGS}"]; +s[%OCTAVE_CONF_XTRA_CXXFLAGS%]["$ENV{XTRA_CXXFLAGS}"]; +s[%OCTAVE_CONF_YACC%]["$ENV{YACC}"]; +s[%OCTAVE_CONF_YFLAGS%]["$ENV{YFLAGS}"]; +s[%OCTAVE_CONF_Z_CPPFLAGS%]["$ENV{Z_CPPFLAGS}"]; +s[%OCTAVE_CONF_Z_LDFLAGS%]["$ENV{Z_LDFLAGS}"]; +s[%OCTAVE_CONF_Z_LIBS%]["$ENV{Z_LIBS}"]; +s[%OCTAVE_CONF_config_opts%]["$ENV{config_opts}"];