don't generate makefiles for the samples which don't build in current configuration

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-06-28 11:49:34 +00:00
parent 9de9b8f0fc
commit 166263e652
2 changed files with 21 additions and 4 deletions

11
configure vendored
View File

@ -34736,10 +34736,17 @@ if test "$wxUSE_GUI" = "yes"; then
else SUBDIRS="samples utils"
fi
for subdir in echo `$SUBDIRS`; do
for subdir in `echo $SUBDIRS`; do
if test -d ${srcdir}/${subdir} ; then
if test "$wxUSE_GUI" = "yes"; then
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
if test ${subdir} = "samples"; then
for sample in `echo $SAMPLES_SUBDIRS`; do
if test -d $srcdir/samples/$sample; then
makefiles="samples/$sample/Makefile.in $makefiles"
fi
done
else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
fi
else if test ${subdir} = "samples"; then
makefiles="samples/console/Makefile.in"
else makefiles="utils/HelpGen/Makefile.in \

View File

@ -5804,10 +5804,20 @@ else dnl we build wxBase only
SUBDIRS="samples utils"
fi
for subdir in echo `$SUBDIRS`; do
for subdir in `echo $SUBDIRS`; do
if test -d ${srcdir}/${subdir} ; then
if test "$wxUSE_GUI" = "yes"; then
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
if test ${subdir} = "samples"; then
dnl only take those samples which compile in the current
dnl configuration and which exist
for sample in `echo $SAMPLES_SUBDIRS`; do
if test -d $srcdir/samples/$sample; then
makefiles="samples/$sample/Makefile.in $makefiles"
fi
done
else dnl assume that everything compiles for utils &c
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
fi
else dnl we build wxBase only
dnl don't take all samples/utils, just those which build with
dnl wxBase