Moved mobile dir.

Made enable-no_rtti etc NO default.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure

@@ -1468,8 +1468,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=yes
-  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -1642,8 +1642,8 @@ else
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=yes
-  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=no
   DEFAULT_wxUSE_DEBUG_INFO=no
@@ -17133,9 +17133,9 @@ if test "$TOOLKIT" != "MSW"; then
                                                 THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                 ;;
           *-*-darwin*)
-                                                THREAD_OPTS=""
+                                THREAD_OPTS=""
                 ;;
-          *-*-aix* )
+          *-*-aix*)
                                 THREAD_OPTS="pthreads"
                 ;;
         esac
@@ -20518,7 +20518,7 @@ if test "$wxUSE_GUI" = "yes"; then
             export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
            wx_cv_path_ifs wx_cv_program_ext \
            wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
-    subdirs="demos samples utils contrib mobile"
+    subdirs="demos samples utils contrib"
 
 fi
 
@@ -21049,7 +21049,7 @@ if test "$no_recursion" != yes; then
     esac
   done
 
-  for ac_config_dir in demos samples utils contrib mobile; do
+  for ac_config_dir in demos samples utils contrib; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.

configure.in

@@ -335,8 +335,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=yes
-  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -509,8 +509,8 @@ else
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=yes
-  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=no
   DEFAULT_wxUSE_DEBUG_INFO=no
@@ -4937,7 +4937,7 @@ if test "$wxUSE_GUI" = "yes"; then
     export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
            wx_cv_path_ifs wx_cv_program_ext \
            wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
-    AC_CONFIG_SUBDIRS(demos samples utils contrib mobile)
+    AC_CONFIG_SUBDIRS(demos samples utils contrib)
 fi
 
 dnl create each of the files in the space separated list from the file.in

mobile/Makefile.in

@@ -1,11 +0,0 @@
-#
-# Makefile : Builds wxWindows samples for Unix.
-#
-
-MOBILE_SUBDIRS=@MOBILE_SUBDIRS@
-
-all:
-	@for d in $(MOBILE_SUBDIRS); do (cd $$d && $(MAKE)); done
-
-clean:
-	@for d in $(MOBILE_SUBDIRS); do (cd $$d && $(MAKE) clean); done

mobile/configure.in

@@ -1,24 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id$)dnl
-
-AC_INIT(Makefile.in)
-
-MOBILE_SUBDIRS=$wx_cv_path_mobilesubdirs
-AC_SUBST(MOBILE_SUBDIRS)
-
-IF_GNU_MAKE=$wx_cv_if_gnu_make
-PATH_IFS=$wx_cv_path_ifs
-PROGRAM_EXT=$wx_cv_program_ext
-WX_TARGET_LIBRARY=$wx_cv_target_library
-WX_TARGET_LIBRARY_GL=$wx_cv_target_library_gl
-
-AC_SUBST(IF_GNU_MAKE)
-AC_SUBST(PATH_IFS)
-AC_SUBST(PROGRAM_EXT)
-AC_SUBST(WX_TARGET_LIBRARY)
-AC_SUBST(WX_TARGET_LIBRARY_GL)
-
-AC_OUTPUT([
-            Makefile
-            wxedit/Makefile
-        ])

samples/configure

@@ -686,6 +686,8 @@ trap 'rm -fr `echo "
             memcheck/Makefile
             minifram/Makefile
             minimal/Makefile
+            mobile/Makefile
+            mobile/wxedit/Makefile
             newgrid/Makefile
             notebook/Makefile
             png/Makefile
@@ -837,6 +839,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
             memcheck/Makefile
             minifram/Makefile
             minimal/Makefile
+            mobile/Makefile
+            mobile/wxedit/Makefile
             newgrid/Makefile
             notebook/Makefile
             png/Makefile

samples/configure.in

@@ -54,6 +54,8 @@ AC_OUTPUT([
             memcheck/Makefile
             minifram/Makefile
             minimal/Makefile
+            mobile/Makefile
+            mobile/wxedit/Makefile
             newgrid/Makefile
             notebook/Makefile
             png/Makefile

samples/mobile/Makefile.in

@@ -0,0 +1,9 @@
+#
+# Makefile : Builds wxWindows samples for Unix.
+#
+
+all:
+	cd wxedit && $(MAKE)
+
+clean:
+	cd wxedit && $(MAKE) clean

samples/mobile/wxedit/Makefile.in

@@ -10,14 +10,14 @@
 # Makefile for wxedit
 
 top_srcdir = @top_srcdir@/..
-top_builddir = ../..
-program_dir = mobile/wxedit
+top_builddir = ../../..
+program_dir = samples/mobile/wxedit
 
 PROGRAM=wxedit
 
 OBJECTS =$(PROGRAM).o
 DEPFILES=$(PROGRAM).d
 
-include ../../src/makeprog.env
+include ../../../src/makeprog.env
 
 @IF_GNU_MAKE@-include $(DEPFILES)