updated configure and the makefiles after the samples move

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

diff --git a/configure b/configure
index 97556aeb60265299993904581d84268279fe2bfa..9ff8d7116313aca6f06a43be025a3b950999cc41 100755 (executable)
--- a/configure
+++ b/configure
@@ -11516,7 +11516,7 @@ if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
 #define wxUSE_DIALUP_MANAGER 1
 EOF
 
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
@@ -12056,7 +12056,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 #define wxUSE_SOCKETS 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
     INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
@@ -12932,8 +12932,8 @@ LDFLAGS="$LDFLAGS $PROFILE"
 
 if test "$wxUSE_GUI" = "yes"; then
         
-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
-                     font forty fractal image minimal richedit wxpoem"
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
+                     font fractal image minimal richedit"
 
         CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
 else
@@ -13143,8 +13143,13 @@ trap 'rm -fr `echo "
             src/makeprog.env
             src/makelib.env
             Makefile
+            demos/Makefile
+            demos/bombs/Makefile
+            demos/forty/Makefile
+            demos/fractal/Makefile
+            demos/life/Makefile
+            demos/poem/Makefile
             samples/Makefile
-            samples/bombs/Makefile
             samples/caret/Makefile
             samples/calendar/Makefile
             samples/checklst/Makefile
@@ -13157,20 +13162,17 @@ trap 'rm -fr `echo "
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
-            samples/forty/Makefile
             samples/font/Makefile
-            samples/fractal/Makefile
             samples/grid/Makefile
             samples/help/Makefile
             samples/image/Makefile
             samples/internat/Makefile
             samples/layout/Makefile
-            samples/life/Makefile
             samples/listctrl/Makefile
             samples/mdi/Makefile
             samples/minifram/Makefile
             samples/minimal/Makefile
-            samples/nettest/Makefile
+            samples/dialup/Makefile
             samples/newgrid/Makefile
             samples/notebook/Makefile
             samples/png/Makefile
@@ -13189,8 +13191,7 @@ trap 'rm -fr `echo "
             samples/treectrl/Makefile
             samples/typetest/Makefile
             samples/validate/Makefile
-            samples/wxpoem/Makefile
-            samples/wxsocket/Makefile
+            samples/sockets/Makefile
             samples/wizard/Makefile
             samples/html/Makefile
             samples/html/about/Makefile
@@ -13372,8 +13373,13 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
             src/makeprog.env
             src/makelib.env
             Makefile
+            demos/Makefile
+            demos/bombs/Makefile
+            demos/forty/Makefile
+            demos/fractal/Makefile
+            demos/life/Makefile
+            demos/poem/Makefile
             samples/Makefile
-            samples/bombs/Makefile
             samples/caret/Makefile
             samples/calendar/Makefile
             samples/checklst/Makefile
@@ -13386,20 +13392,17 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
-            samples/forty/Makefile
             samples/font/Makefile
-            samples/fractal/Makefile
             samples/grid/Makefile
             samples/help/Makefile
             samples/image/Makefile
             samples/internat/Makefile
             samples/layout/Makefile
-            samples/life/Makefile
             samples/listctrl/Makefile
             samples/mdi/Makefile
             samples/minifram/Makefile
             samples/minimal/Makefile
-            samples/nettest/Makefile
+            samples/dialup/Makefile
             samples/newgrid/Makefile
             samples/notebook/Makefile
             samples/png/Makefile
@@ -13418,8 +13421,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config
             samples/treectrl/Makefile
             samples/typetest/Makefile
             samples/validate/Makefile
-            samples/wxpoem/Makefile
-            samples/wxsocket/Makefile
+            samples/sockets/Makefile
             samples/wizard/Makefile
             samples/html/Makefile
             samples/html/about/Makefile

diff --git a/configure.in b/configure.in
index fae5b7f541cce3615a55c3cb76dfd63c929a344e..a50930acfca6e2d2a35e1a7acf6b80593e134b32 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2478,7 +2478,7 @@ fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
   AC_DEFINE(wxUSE_DIALUP_MANAGER)
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
 fi
 
 if test "$wxUSE_STREAMS" = "yes" ; then
@@ -2652,7 +2652,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
     AC_LANG_RESTORE
 
     AC_DEFINE(wxUSE_SOCKETS)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
     INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
@@ -3159,9 +3159,9 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl      library features they need are present)
 
     dnl TODO some samples are never built so far:
-    dnl      mfc, nativdlg, oleauto, ownerdrw, proplist
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
-                     font forty fractal image minimal richedit wxpoem"
+    dnl      ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs drawing dynamic \
+                     font fractal image minimal richedit"
 
     dnl this is needed to be able to find AFM files
     CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
@@ -3265,8 +3265,13 @@ AC_OUTPUT([
             src/makeprog.env
             src/makelib.env
             Makefile
+            demos/Makefile
+            demos/bombs/Makefile
+            demos/forty/Makefile
+            demos/fractal/Makefile
+            demos/life/Makefile
+            demos/poem/Makefile
             samples/Makefile
-            samples/bombs/Makefile
             samples/caret/Makefile
             samples/calendar/Makefile
             samples/checklst/Makefile
@@ -3279,20 +3284,17 @@ AC_OUTPUT([
             samples/docvwmdi/Makefile
             samples/dnd/Makefile
             samples/drawing/Makefile
-            samples/forty/Makefile
             samples/font/Makefile
-            samples/fractal/Makefile
             samples/grid/Makefile
             samples/help/Makefile
             samples/image/Makefile
             samples/internat/Makefile
             samples/layout/Makefile
-            samples/life/Makefile
             samples/listctrl/Makefile
             samples/mdi/Makefile
             samples/minifram/Makefile
             samples/minimal/Makefile
-            samples/nettest/Makefile
+            samples/dialup/Makefile
             samples/newgrid/Makefile
             samples/notebook/Makefile
             samples/png/Makefile
@@ -3311,8 +3313,7 @@ AC_OUTPUT([
             samples/treectrl/Makefile
             samples/typetest/Makefile
             samples/validate/Makefile
-            samples/wxpoem/Makefile
-            samples/wxsocket/Makefile
+            samples/sockets/Makefile
             samples/wizard/Makefile
             samples/html/Makefile
             samples/html/about/Makefile

diff --git a/demos/Makefile.in b/demos/Makefile.in
new file mode 100644 (file)
index 0000000..f0d1d65
--- /dev/null
+++ b/demos/Makefile.in
@@ -0,0 +1,11 @@
+#
+# Makefile : Builds wxWindows demos for Unix.
+#
+
+DEMOS_SUBDIRS=bombs forty fractal life poem
+
+all:
+       @for d in $(DEMOS_SUBDIRS); do (cd $$d && make); done
+
+clean:
+       @for d in $(DEMOS_SUBDIRS); do (cd $$d && make clean); done

diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index 90ec3d1ea59db1041d96642974549bce75c87926..769f9e9532154ffb50a9ed5e0bb817eb4bbec7b8 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/bombs
+program_dir = demos/bombs
 
 PROGRAM=bombs
 

diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 9398b93b0169b2b15ffaf283d79b2c41ae059c65..49d2e728182d84655cd7b05f581886996c4a43cc 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/forty
+program_dir = demos/forty
 
 PROGRAM=forty
 

diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 28486d18b0557fcd9cf9429e965e4ba05d206477..a073969cba465796ed444dcadba5635d21ec580d 100644 (file)
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/fractal
+program_dir = demos/fractal
 
 PROGRAM=fractal
 

diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index 5e9184ba9a5bde695655a0addf5230127608958d..a2d5c4910c7593aa783b3b9263bad8665ce74d11 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/life
+program_dir = demos/life
 
 PROGRAM=life
 

diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index eed47362b99d759fb71ca202d5d1e05d62e8731e..82dc4a0bfb462a2eb5a8dffabc1d9b5cf965b74e 100644 (file)
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -11,7 +11,7 @@
 
 top_srcdir = @top_srcdir@
 top_builddir = ../..
-program_dir = samples/wxpoem
+program_dir = demos/poem
 
 DATAFILES = wxpoem.txt wxpoem.dat
 

diff --git a/docs/changes.txt b/docs/changes.txt
index 84dd1cf743fc4054c818afde1f148afa3c764555..8adf6fd3ca2dc2cc054f09587cb3f6a3978611d8 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -11,6 +11,9 @@ wxBase:
 
 - wxLongLong class provides support for (signed) 64 bit integers
 
+- wxCmdLineParser class for parsing the command line (supporting short and
+  long options, switches and parameters of different types)
+
 - it is now possible to build wxBase under Win32 (using VC++ only so far)
   and BeOS (without thread support yet)