Setup production build of wx-console on Win32

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1290 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/configure b/bacula/configure
index 15dc243dfa93c6bff0078000946cbe5b78cc5772..92517a105a63084fc036c77c464c67f47f73c6c1 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -18186,7 +18186,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf $PFILES"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf $PFILES"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18801,6 +18801,7 @@ do
   "src/win32/baculafd/bacula-fd.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/baculafd/bacula-fd.conf" ;;
   "src/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/Makefile" ;;
   "src/win32/console/bconsole.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/console/bconsole.conf" ;;
+  "src/win32/wx-console/wx-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/wx-console/wx-console.conf" ;;
   "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:autoconf/config.h.in" ;;

diff --git a/bacula/src/win32/Makefile.in b/bacula/src/win32/Makefile.in
index 9db215650a76fd66137e535e9ba79039520d999f..cf800d3f1fc7b12456956a605da0fec54aa0aa46 100644 (file)
--- a/bacula/src/win32/Makefile.in
+++ b/bacula/src/win32/Makefile.in
@@ -5,6 +5,20 @@
 #     Kern Sibbald, February 2004
 #
 
+srcdir =       .
+VPATH =        .
+.PATH:         .
+
+# one up
+basedir = ..
+# top dir
+topdir = ../..
+# this dir relative to top dir
+thisdir = src/win32
+
+DEBUG=@DEBUG@
+
+
 NMAKE=nmake
 MAKENSIS="c:/Program Files/NSIS/makensis"
 
@@ -15,13 +29,13 @@ dummy:
 all:  bacula bconsole wx-console installer
 
 
-bacula:
+bacula: dummy
        (cd baculafd; env MAKEFLAGS= ${NMAKE} CFG="baculafd - Win32 Release" /f baculafd.mak)
 
-bconsole:
+bconsole: dummy
        (cd console; env MAKEFLAGS= ${NMAKE} CFG="console - Win32 Release" /f console.mak)
        
-wx-console:
+wx-console: dummy
        (cd wx-console; env MAKEFLAGS= ${NMAKE} CFG="wx-console - Win32 Release" /f wx-console.mak)
 
 #
@@ -43,6 +57,12 @@ installer: winbacula.exe
 winbacula.exe: bacula
        ${MAKENSIS} winbacula.nsi
 
+
+Makefile: $(srcdir)/Makefile.in $(topdir)/config.status winbacula.nsi.in
+       cd $(topdir) \
+         && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= \
+         $(SHELL) ./config.status
+
 clean:
        (cd baculafd; make clean)
 

diff --git a/bacula/src/win32/winbacula.nsi.in b/bacula/src/win32/winbacula.nsi.in
index 6cb0334b0e9ca98a5dce11c46318fb537ffde387..98358b60780eea07dc1c694f542331ae4b0ea6be 100755 (executable)
--- a/bacula/src/win32/winbacula.nsi.in
+++ b/bacula/src/win32/winbacula.nsi.in
@@ -26,6 +26,7 @@
 ;
   Name "Bacula Client"
   OutFile "winbacula-${VERSION}.exe"
+  SetCompressor lzma
   InstallDir "c:\bacula"
 
 ;
@@ -167,10 +168,10 @@ Section "Install wx-Console" SecWxConsole
   SetOutPath "$INSTDIR\bin"
   File wx-console\Release\wx-console.exe
   IfFileExists "$INSTDIR\bin\wx-console.conf" newconf 
-  File console\wx-console.conf
+  File wx-console\wx-console.conf
   goto do_next
  newconf:
-  File /oname=wx-console.conf.new console\wx-console.conf
+  File /oname=wx-console.conf.new wx-console\wx-console.conf
        
   ; If /service was given jump to the service install part
  do_next:

diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak
index 0a447932a3e8fbd9b1b8b60bb837557f3157b4f8..84928698866231cba3ee7098a8997155e23aa85d 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak
+++ b/bacula/src/win32/wx-console/wx-console.mak
@@ -40,128 +40,128 @@ ALL : "$(OUTDIR)\wx-console.exe"
 
 
 CLEAN :
-       -@erase "$(INTDIR)\alist.obj"
-       -@erase "$(INTDIR)\alloc.obj"
-       -@erase "$(INTDIR)\attr.obj"
-       -@erase "$(INTDIR)\base64.obj"
-       -@erase "$(INTDIR)\bget_msg.obj"
-       -@erase "$(INTDIR)\bnet.obj"
-       -@erase "$(INTDIR)\bnet_pkt.obj"
-       -@erase "$(INTDIR)\bnet_server.obj"
-       -@erase "$(INTDIR)\bshm.obj"
-       -@erase "$(INTDIR)\bsys.obj"
-       -@erase "$(INTDIR)\btime.obj"
-       -@erase "$(INTDIR)\cram-md5.obj"
-       -@erase "$(INTDIR)\crc32.obj"
-       -@erase "$(INTDIR)\daemon.obj"
-       -@erase "$(INTDIR)\dlist.obj"
-       -@erase "$(INTDIR)\edit.obj"
-       -@erase "$(INTDIR)\fnmatch.obj"
-       -@erase "$(INTDIR)\hmac.obj"
-       -@erase "$(INTDIR)\htable.obj"
-       -@erase "$(INTDIR)\idcache.obj"
-       -@erase "$(INTDIR)\jcr.obj"
-       -@erase "$(INTDIR)\lex.obj"
-       -@erase "$(INTDIR)\md5.obj"
-       -@erase "$(INTDIR)\mem_pool.obj"
-       -@erase "$(INTDIR)\message.obj"
-       -@erase "$(INTDIR)\parse_conf.obj"
-       -@erase "$(INTDIR)\queue.obj"
-       -@erase "$(INTDIR)\rwlock.obj"
-       -@erase "$(INTDIR)\scan.obj"
-       -@erase "$(INTDIR)\semlock.obj"
-       -@erase "$(INTDIR)\serial.obj"
-       -@erase "$(INTDIR)\sha1.obj"
-       -@erase "$(INTDIR)\signal.obj"
-       -@erase "$(INTDIR)\smartall.obj"
-       -@erase "$(INTDIR)\timers.obj"
-       -@erase "$(INTDIR)\tree.obj"
-       -@erase "$(INTDIR)\util.obj"
-       -@erase "$(INTDIR)\var.obj"
-       -@erase "$(INTDIR)\watchdog.obj"
-       -@erase "$(INTDIR)\workq.obj"
-       -@erase "$(INTDIR)\compat.obj"
-       -@erase "$(INTDIR)\print.obj"
-       -@erase "$(INTDIR)\authenticate.obj"
-       -@erase "$(INTDIR)\console_conf.obj"
-       -@erase "$(INTDIR)\console_thread.obj"
-       -@erase "$(INTDIR)\main.obj"
-       -@erase "$(INTDIR)\wxblistctrl.obj"
-       -@erase "$(INTDIR)\wxbmainframe.obj"
-       -@erase "$(INTDIR)\wxbrestorepanel.obj"
-       -@erase "$(INTDIR)\wxbtableparser.obj"
-       -@erase "$(INTDIR)\wxbtreectrl.obj"
-       -@erase "$(INTDIR)\wxbutils.obj"
-       -@erase "$(OUTDIR)\wx-console.exe"
+        -@erase "$(INTDIR)\alist.obj"
+        -@erase "$(INTDIR)\alloc.obj"
+        -@erase "$(INTDIR)\attr.obj"
+        -@erase "$(INTDIR)\base64.obj"
+        -@erase "$(INTDIR)\bget_msg.obj"
+        -@erase "$(INTDIR)\bnet.obj"
+        -@erase "$(INTDIR)\bnet_pkt.obj"
+        -@erase "$(INTDIR)\bnet_server.obj"
+        -@erase "$(INTDIR)\bshm.obj"
+        -@erase "$(INTDIR)\bsys.obj"
+        -@erase "$(INTDIR)\btime.obj"
+        -@erase "$(INTDIR)\cram-md5.obj"
+        -@erase "$(INTDIR)\crc32.obj"
+        -@erase "$(INTDIR)\daemon.obj"
+        -@erase "$(INTDIR)\dlist.obj"
+        -@erase "$(INTDIR)\edit.obj"
+        -@erase "$(INTDIR)\fnmatch.obj"
+        -@erase "$(INTDIR)\hmac.obj"
+        -@erase "$(INTDIR)\htable.obj"
+        -@erase "$(INTDIR)\idcache.obj"
+        -@erase "$(INTDIR)\jcr.obj"
+        -@erase "$(INTDIR)\lex.obj"
+        -@erase "$(INTDIR)\md5.obj"
+        -@erase "$(INTDIR)\mem_pool.obj"
+        -@erase "$(INTDIR)\message.obj"
+        -@erase "$(INTDIR)\parse_conf.obj"
+        -@erase "$(INTDIR)\queue.obj"
+        -@erase "$(INTDIR)\rwlock.obj"
+        -@erase "$(INTDIR)\scan.obj"
+        -@erase "$(INTDIR)\semlock.obj"
+        -@erase "$(INTDIR)\serial.obj"
+        -@erase "$(INTDIR)\sha1.obj"
+        -@erase "$(INTDIR)\signal.obj"
+        -@erase "$(INTDIR)\smartall.obj"
+        -@erase "$(INTDIR)\timers.obj"
+        -@erase "$(INTDIR)\tree.obj"
+        -@erase "$(INTDIR)\util.obj"
+        -@erase "$(INTDIR)\var.obj"
+        -@erase "$(INTDIR)\watchdog.obj"
+        -@erase "$(INTDIR)\workq.obj"
+        -@erase "$(INTDIR)\compat.obj"
+        -@erase "$(INTDIR)\print.obj"
+        -@erase "$(INTDIR)\authenticate.obj"
+        -@erase "$(INTDIR)\console_conf.obj"
+        -@erase "$(INTDIR)\console_thread.obj"
+        -@erase "$(INTDIR)\main.obj"
+        -@erase "$(INTDIR)\wxblistctrl.obj"
+        -@erase "$(INTDIR)\wxbmainframe.obj"
+        -@erase "$(INTDIR)\wxbrestorepanel.obj"
+        -@erase "$(INTDIR)\wxbtableparser.obj"
+        -@erase "$(INTDIR)\wxbtreectrl.obj"
+        -@erase "$(INTDIR)\wxbutils.obj"
+        -@erase "$(OUTDIR)\wx-console.exe"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "NDEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/include" /I "../../../../depkgs-win32/wx/lib/msw" /I "../../../../depkgs-win32/pthreads" /I "../../../../depkgs-win32/zlib" /I "." /D "NDEBUG" /D "WIN32" /D "__WXMSW__" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "HAVE_WXCONSOLE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "NDEBUG" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" 
 BSC32_SBRS= \
-       
+        
 LINK32=link.exe
 LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib winmm.lib \
   comctl32.lib comdlg32.lib Shell32.lib AdvAPI32.lib User32.lib Gdi32.lib wsock32.lib \
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmt.lib \
-  /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
+  /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
 LINK32_OBJS= \
-       "$(INTDIR)\alist.obj" \
-       "$(INTDIR)\alloc.obj" \
-       "$(INTDIR)\attr.obj" \
-       "$(INTDIR)\base64.obj" \
-       "$(INTDIR)\bget_msg.obj" \
-       "$(INTDIR)\bnet.obj" \
-       "$(INTDIR)\bnet_pkt.obj" \
-       "$(INTDIR)\bnet_server.obj" \
-       "$(INTDIR)\bshm.obj" \
-       "$(INTDIR)\bsys.obj" \
-       "$(INTDIR)\btime.obj" \
-       "$(INTDIR)\cram-md5.obj" \
-       "$(INTDIR)\crc32.obj" \
-       "$(INTDIR)\daemon.obj" \
-       "$(INTDIR)\dlist.obj" \
-       "$(INTDIR)\edit.obj" \
-       "$(INTDIR)\fnmatch.obj" \
-       "$(INTDIR)\hmac.obj" \
-       "$(INTDIR)\htable.obj" \
-       "$(INTDIR)\idcache.obj" \
-       "$(INTDIR)\jcr.obj" \
-       "$(INTDIR)\lex.obj" \
-       "$(INTDIR)\md5.obj" \
-       "$(INTDIR)\mem_pool.obj" \
-       "$(INTDIR)\message.obj" \
-       "$(INTDIR)\parse_conf.obj" \
-       "$(INTDIR)\queue.obj" \
-       "$(INTDIR)\rwlock.obj" \
-       "$(INTDIR)\scan.obj" \
-       "$(INTDIR)\semlock.obj" \
-       "$(INTDIR)\serial.obj" \
-       "$(INTDIR)\sha1.obj" \
-       "$(INTDIR)\signal.obj" \
-       "$(INTDIR)\smartall.obj" \
-       "$(INTDIR)\timers.obj" \
-       "$(INTDIR)\tree.obj" \
-       "$(INTDIR)\util.obj" \
-       "$(INTDIR)\var.obj" \
-       "$(INTDIR)\watchdog.obj" \
-       "$(INTDIR)\workq.obj" \
-       "$(INTDIR)\compat.obj" \
-       "$(INTDIR)\print.obj" \
-       "$(INTDIR)\authenticate.obj" \
-       "$(INTDIR)\console_conf.obj" \
-       "$(INTDIR)\console_thread.obj" \
-       "$(INTDIR)\main.obj" \
-       "$(INTDIR)\wxblistctrl.obj" \
-       "$(INTDIR)\wxbmainframe.obj" \
-       "$(INTDIR)\wxbrestorepanel.obj" \
-       "$(INTDIR)\wxbtableparser.obj" \
-       "$(INTDIR)\wxbtreectrl.obj" \
-       "$(INTDIR)\wxbutils.obj" \
-       "$(INTDIR)\wx-console_private.res"
+        "$(INTDIR)\alist.obj" \
+        "$(INTDIR)\alloc.obj" \
+        "$(INTDIR)\attr.obj" \
+        "$(INTDIR)\base64.obj" \
+        "$(INTDIR)\bget_msg.obj" \
+        "$(INTDIR)\bnet.obj" \
+        "$(INTDIR)\bnet_pkt.obj" \
+        "$(INTDIR)\bnet_server.obj" \
+        "$(INTDIR)\bshm.obj" \
+        "$(INTDIR)\bsys.obj" \
+        "$(INTDIR)\btime.obj" \
+        "$(INTDIR)\cram-md5.obj" \
+        "$(INTDIR)\crc32.obj" \
+        "$(INTDIR)\daemon.obj" \
+        "$(INTDIR)\dlist.obj" \
+        "$(INTDIR)\edit.obj" \
+        "$(INTDIR)\fnmatch.obj" \
+        "$(INTDIR)\hmac.obj" \
+        "$(INTDIR)\htable.obj" \
+        "$(INTDIR)\idcache.obj" \
+        "$(INTDIR)\jcr.obj" \
+        "$(INTDIR)\lex.obj" \
+        "$(INTDIR)\md5.obj" \
+        "$(INTDIR)\mem_pool.obj" \
+        "$(INTDIR)\message.obj" \
+        "$(INTDIR)\parse_conf.obj" \
+        "$(INTDIR)\queue.obj" \
+        "$(INTDIR)\rwlock.obj" \
+        "$(INTDIR)\scan.obj" \
+        "$(INTDIR)\semlock.obj" \
+        "$(INTDIR)\serial.obj" \
+        "$(INTDIR)\sha1.obj" \
+        "$(INTDIR)\signal.obj" \
+        "$(INTDIR)\smartall.obj" \
+        "$(INTDIR)\timers.obj" \
+        "$(INTDIR)\tree.obj" \
+        "$(INTDIR)\util.obj" \
+        "$(INTDIR)\var.obj" \
+        "$(INTDIR)\watchdog.obj" \
+        "$(INTDIR)\workq.obj" \
+        "$(INTDIR)\compat.obj" \
+        "$(INTDIR)\print.obj" \
+        "$(INTDIR)\authenticate.obj" \
+        "$(INTDIR)\console_conf.obj" \
+        "$(INTDIR)\console_thread.obj" \
+        "$(INTDIR)\main.obj" \
+        "$(INTDIR)\wxblistctrl.obj" \
+        "$(INTDIR)\wxbmainframe.obj" \
+        "$(INTDIR)\wxbrestorepanel.obj" \
+        "$(INTDIR)\wxbtableparser.obj" \
+        "$(INTDIR)\wxbtreectrl.obj" \
+        "$(INTDIR)\wxbutils.obj" \
+        "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -216,267 +216,264 @@ LINK32_OBJS= \
 SOURCE=..\..\wx-console\wx-console_private.rc
 
 "$(INTDIR)\wx-console_private.res" : $(SOURCE) "$(INTDIR)"
-       $(RSC) /l 0x409 /fo"$(INTDIR)\wx-console_private.res" /d "NDEBUG" $(SOURCE)
+        $(RSC) /l 0x409 /fo"$(INTDIR)\wx-console_private.res" /d "NDEBUG" $(SOURCE)
 
 FILENAME=alist
 SOURCE=..\lib\alist.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=alloc
 SOURCE=..\lib\alloc.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=attr
 SOURCE=..\lib\attr.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=base64
 SOURCE=..\lib\base64.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=bget_msg
 SOURCE=..\lib\bget_msg.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=bnet
 SOURCE=..\lib\bnet.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=bnet_pkt
 SOURCE=..\lib\bnet_pkt.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=bnet_server
 SOURCE=..\lib\bnet_server.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=bshm
 SOURCE=..\lib\bshm.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=bsys
 SOURCE=..\lib\bsys.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=btime
 SOURCE=..\lib\btime.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=cram-md5
 SOURCE=..\lib\cram-md5.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=crc32
 SOURCE=..\lib\crc32.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=daemon
 SOURCE=..\lib\daemon.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=dlist
 SOURCE=..\lib\dlist.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=edit
 SOURCE=..\lib\edit.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=fnmatch
 SOURCE=..\lib\fnmatch.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=hmac
 SOURCE=..\lib\hmac.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=htable
 SOURCE=..\lib\htable.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=idcache
 SOURCE=..\lib\idcache.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=jcr
 SOURCE=..\lib\jcr.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=lex
 SOURCE=..\lib\lex.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=md5
 SOURCE=..\lib\md5.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=mem_pool
 SOURCE=..\lib\mem_pool.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=message
 SOURCE=..\lib\message.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=parse_conf
 SOURCE=..\lib\parse_conf.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=queue
 SOURCE=..\lib\queue.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=rwlock
 SOURCE=..\lib\rwlock.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=scan
 SOURCE=..\lib\scan.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=semlock
 SOURCE=..\lib\semlock.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=serial
 SOURCE=..\lib\serial.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=sha1
 SOURCE=..\lib\sha1.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=signal
 SOURCE=..\lib\signal.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=smartall
 SOURCE=..\lib\smartall.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=timers
 SOURCE=..\lib\timers.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=tree
 SOURCE=..\lib\tree.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=util
 SOURCE=..\lib\util.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=var
 SOURCE=..\lib\var.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=watchdog
 SOURCE=..\lib\watchdog.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=workq
 SOURCE=..\lib\workq.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=compat
 SOURCE=..\compat\compat.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=print
 SOURCE=..\compat\print.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=authenticate
 SOURCE=.\authenticate.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=console_conf
 SOURCE=.\console_conf.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=console_thread
 SOURCE=..\..\wx-console\console_thread.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=main
 SOURCE=..\..\wx-console\main.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=wxblistctrl
 SOURCE=..\..\wx-console\wxblistctrl.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=wxbmainframe
 SOURCE=..\..\wx-console\wxbmainframe.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=wxbrestorepanel
 SOURCE=..\..\wx-console\wxbrestorepanel.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=wxbtableparser
 SOURCE=..\..\wx-console\wxbtableparser.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=wxbtreectrl
 SOURCE=..\..\wx-console\wxbtreectrl.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
+        $(CPP) $(CPP_PROJ) $(SOURCE)
 
 FILENAME=wxbutils
 SOURCE=..\..\wx-console\wxbutils.cpp
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
+        $(CPP) $(CPP_PROJ) $(SOURCE)