new dependency tracking from bakefile cvs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
83
configure
vendored
83
configure
vendored
@@ -311,7 +311,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TYPE COND_SHARED_1_MONOLITHIC_0 COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_GUI_1 COND_WXUSE_ODBC_BUILTIN COND_TOOLKIT_X11 COND_TOOLKIT_MGL COND_TOOLKIT_GTK COND_TOOLKIT_MSW COND_TOOLKIT_MAC COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBTIFF_BUILTIN COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 COND_MONOLITHIC_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MOTIF COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_0 COND_SHARED_1_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_PLATFORM_WIN32_0 COND_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_0 COND_BUILD_DEBUG COND_DEPS_TYPE_GCC COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX SONAME_FLAGS SONAME_FLAGS_GL WX_TARGET_LIBRARY_SONAME WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_SHARED_1_MONOLITHIC_0 COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_GUI_1 COND_WXUSE_ODBC_BUILTIN COND_TOOLKIT_X11 COND_TOOLKIT_MGL COND_TOOLKIT_GTK COND_TOOLKIT_MSW COND_TOOLKIT_MAC COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBTIFF_BUILTIN COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 COND_MONOLITHIC_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MOTIF COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_0 COND_SHARED_1_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_PLATFORM_WIN32_0 COND_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_0 COND_BUILD_DEBUG COND_DEPS_TYPE_GCC COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_DEPS_TRACKING_1 COND_DEPS_TRACKING_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX SONAME_FLAGS SONAME_FLAGS_GL WX_TARGET_LIBRARY_SONAME WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -33793,7 +33793,7 @@ fi
|
||||
|
||||
echo "$as_me:$LINENO: checking if make is GNU make" >&5
|
||||
echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6
|
||||
if test "${wx_cv_prog_makeisgnu+set}" = set; then
|
||||
if test "${bakefile_cv_prog_makeisgnu+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
@@ -33805,8 +33805,8 @@ else
|
||||
fi
|
||||
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5
|
||||
echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6
|
||||
echo "$as_me:$LINENO: result: $bakefile_cv_prog_makeisgnu" >&5
|
||||
echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
|
||||
|
||||
if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
|
||||
IF_GNU_MAKE=""
|
||||
@@ -34174,9 +34174,66 @@ echo "$as_me: error: unknown system type $host." >&2;}
|
||||
|
||||
|
||||
|
||||
DEPS_TYPE=no
|
||||
echo "$as_me:$LINENO: checking for dependency tracking method" >&5
|
||||
echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6
|
||||
DEPS_TRACKING=0
|
||||
|
||||
if test "x$GCC" = "xyes"; then
|
||||
DEPS_TYPE=gcc
|
||||
DEPSMODE=gcc
|
||||
DEPS_TRACKING=1
|
||||
echo "$as_me:$LINENO: result: gcc" >&5
|
||||
echo "${ECHO_T}gcc" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: none" >&5
|
||||
echo "${ECHO_T}none" >&6
|
||||
fi
|
||||
|
||||
if test $DEPS_TRACKING = 1 ; then
|
||||
cat <<EOF >bk-deps
|
||||
#!/bin/sh
|
||||
|
||||
# This script is part of Bakefile (http://bakefile.sf.net) autoconf script.
|
||||
# It is used to track C/C++ files dependencies in portable way.
|
||||
#
|
||||
# Permission is given to use this file in any way.
|
||||
|
||||
DEPSMODE=$DEPSMODE
|
||||
DEPSDIR=.deps
|
||||
|
||||
mkdir -p \$DEPSDIR
|
||||
|
||||
if test \$DEPSMODE = gcc ; then
|
||||
\${*} -MMD
|
||||
status=\${?}
|
||||
if test \${status} != 0 ; then
|
||||
exit \${status}
|
||||
fi
|
||||
# move created file to the location we want it in:
|
||||
while test \${#} -gt 0; do
|
||||
case "\${1}" in
|
||||
-o )
|
||||
shift
|
||||
objfile=\${1}
|
||||
;;
|
||||
-* )
|
||||
;;
|
||||
* )
|
||||
srcfile=\${1}
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
depfile=\`basename \$srcfile | sed -e 's/\..*$/.d/g'\`
|
||||
depobjname=\`echo \$depfile |sed -e 's/\.d/.o/g'\`
|
||||
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
|
||||
rm -f \$depfile
|
||||
exit 0
|
||||
else
|
||||
\${*}
|
||||
exit \${?}
|
||||
fi
|
||||
EOF
|
||||
chmod +x bk-deps
|
||||
fi
|
||||
|
||||
|
||||
@@ -34533,6 +34590,16 @@ fi
|
||||
COND_SHARED_0=
|
||||
fi
|
||||
|
||||
COND_DEPS_TRACKING_1="#"
|
||||
if test "x$DEPS_TRACKING" = "x1" ; then
|
||||
COND_DEPS_TRACKING_1=
|
||||
fi
|
||||
|
||||
COND_DEPS_TRACKING_0="#"
|
||||
if test "x$DEPS_TRACKING" = "x0" ; then
|
||||
COND_DEPS_TRACKING_0=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -35429,7 +35496,7 @@ s,@USE_SOVERSOLARIS@,$USE_SOVERSOLARIS,;t t
|
||||
s,@USE_MACVERSION@,$USE_MACVERSION,;t t
|
||||
s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t
|
||||
s,@SONAME_FLAG@,$SONAME_FLAG,;t t
|
||||
s,@DEPS_TYPE@,$DEPS_TYPE,;t t
|
||||
s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t
|
||||
s,@COND_SHARED_1_MONOLITHIC_0@,$COND_SHARED_1_MONOLITHIC_0,;t t
|
||||
s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t
|
||||
s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
|
||||
@@ -35472,6 +35539,8 @@ s,@COND_DEPS_TYPE_GCC@,$COND_DEPS_TYPE_GCC,;t t
|
||||
s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
|
||||
s,@COND_SHARED_1@,$COND_SHARED_1,;t t
|
||||
s,@COND_SHARED_0@,$COND_SHARED_0,;t t
|
||||
s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
|
||||
s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
|
||||
s,@LEX_STEM@,$LEX_STEM,;t t
|
||||
s,@PATH_IFS@,$PATH_IFS,;t t
|
||||
s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
|
||||
|
||||
Reference in New Issue
Block a user