From 678b92a94a3a4897c2546171ce42ca54b25c1e63 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 4 Nov 1999 16:52:23 +0000 Subject: [PATCH] more samples are being built and samples/Makefiles uses SAMPLES_SUBDIRS determined by configure which avoids trying to build the samples which won't compile anyhow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 77 +++++++++++++++++++++++---------------------- configure.in | 4 ++- samples/Makefile.in | 70 +++-------------------------------------- 3 files changed, 47 insertions(+), 104 deletions(-) diff --git a/configure b/configure index a7115696b9..3646c5ffb8 100755 --- a/configure +++ b/configure @@ -11106,6 +11106,7 @@ if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then #define wxUSE_DIALUP_MANAGER 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest" fi if test "$wxUSE_STREAMS" = "yes" ; then @@ -11127,12 +11128,12 @@ if test "$wxUSE_TIMEDATE" = "yes"; then for ac_func in gettimeofday localtime ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11131: checking for $ac_func" >&5 +echo "configure:11132: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11182,7 +11183,7 @@ done if test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:11186: checking whether gettimeofday takes two arguments" >&5 +echo "configure:11187: checking whether gettimeofday takes two arguments" >&5 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11197,7 +11198,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -11211,7 +11212,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -11219,7 +11220,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -11232,7 +11233,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -11276,12 +11277,12 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:11280: checking for socket" >&5 +echo "configure:11281: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -11322,7 +11323,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:11326: checking for socket in -lsocket" >&5 +echo "configure:11327: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11330,7 +11331,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11381,16 +11382,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:11385: checking the type of the third argument of getsockname" >&5 +echo "configure:11386: checking the type of the third argument of getsockname" >&5 cat > conftest.$ac_ext < int main() { socklen_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:11394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T socklen_t @@ -11401,14 +11402,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { size_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:11412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T size_t @@ -11419,14 +11420,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { int len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:11430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T int @@ -11468,17 +11469,17 @@ if test "$wxUSE_JOYSTICK" = 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11472: checking for $ac_hdr" >&5 +echo "configure:11473: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11520,12 +11521,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11524: checking for $ac_func" >&5 +echo "configure:11525: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11576,7 +11577,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:11580: checking for dlopen in -ldl" >&5 +echo "configure:11581: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11584,7 +11585,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11624,12 +11625,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11628: checking for $ac_func" >&5 +echo "configure:11629: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11871,17 +11872,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11875: checking for $ac_hdr" >&5 +echo "configure:11876: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12349,7 +12350,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:12353: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:12354: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12505,6 +12506,7 @@ trap 'rm -fr `echo " samples/dnd/Makefile samples/drawing/Makefile samples/forty/Makefile + samples/font/Makefile samples/fractal/Makefile samples/image/Makefile samples/internat/Makefile @@ -12724,6 +12726,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config samples/dnd/Makefile samples/drawing/Makefile samples/forty/Makefile + samples/font/Makefile samples/fractal/Makefile samples/image/Makefile samples/internat/Makefile diff --git a/configure.in b/configure.in index 882b4ed2c1..5e5ada0afb 100644 --- a/configure.in +++ b/configure.in @@ -2370,6 +2370,7 @@ fi if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then AC_DEFINE(wxUSE_DIALUP_MANAGER) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest" fi if test "$wxUSE_STREAMS" = "yes" ; then @@ -2763,7 +2764,7 @@ fi if test "$wxUSE_SCROLLBAR" = "yes"; then AC_DEFINE(wxUSE_SCROLLBAR) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" fi if test "$wxUSE_SLIDER" = "yes"; then @@ -3052,6 +3053,7 @@ AC_OUTPUT([ samples/dnd/Makefile samples/drawing/Makefile samples/forty/Makefile + samples/font/Makefile samples/fractal/Makefile samples/image/Makefile samples/internat/Makefile diff --git a/samples/Makefile.in b/samples/Makefile.in index 72a6c1caf6..dd53108fc4 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -2,72 +2,10 @@ # Makefile : Builds wxWindows samples for Unix. # +SAMPLES_SUBDIRS=@SAMPLES_SUBDIRS@ + all: - cd bombs && make - cd checklst && make - cd config && make - cd controls && make - cd dialogs && make - cd docview && make - cd docvwmdi && make - cd dynamic && make - cd fractal && make - cd grid && make - cd help && make - cd image && make - cd internat && make - cd layout && make - cd listctrl && make - cd memcheck && make - cd minifram && make - cd minimal && make - cd notebook && make - cd printing && make - cd proplist && make - cd resource && make - cd sashtest && make - cd splitter && make - cd text && make - cd toolbar && make - cd typetest && make - cd validate && make - cd treectrl && make - cd wxpoem && make - cd dnd && make - cd thread && make - cd html && make + @for d in $(SAMPLES_SUBDIRS); do (cd $$d && make); done clean: - cd bombs && make clean - cd checklst && make clean - cd config && make clean - cd controls && make clean - cd dialogs && make clean - cd docview && make clean - cd docvwmdi && make clean - cd dynamic && make clean - cd fractal && make clean - cd grid && make clean - cd help && make clean - cd image && make clean - cd internat && make clean - cd layout && make clean - cd listctrl && make clean - cd memcheck && make clean - cd minifram && make clean - cd minimal && make clean - cd notebook && make clean - cd printing && make clean - cd proplist && make clean - cd resource && make clean - cd sashtest && make clean - cd splitter && make clean - cd toolbar && make clean - cd typetest && make clean - cd validate && make clean - cd treectrl && make clean - cd wxpoem && make clean - cd dnd && make clean - cd thread && make clean - cd html && make clean - + @for d in $(SAMPLES_SUBDIRS); do (cd $$d && make clean); done -- 2.45.2