Add CombineURIs implementation for wxWebFileProtocolHandler. Update the IE backend...

[wxWidgets.git] / samples / sockets / Makefile.in

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index a10a86cc31a11f39869a4533bedabe7f0ea9f6e0..3526c5e6c1806d10e9db7c7930e785b569e47400 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.4 (http://www.bakefile.org)
+#     Bakefile 0.2.9 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -34,41 +34,40 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@

-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@

 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
 
 DESTDIR = 
 WX_RELEASE = 2.9
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
 
 DESTDIR = 
 WX_RELEASE = 2.9

-WX_VERSION = $(WX_RELEASE).0
+WX_VERSION = $(WX_RELEASE).2

 LIBDIRNAME = $(wx_top_builddir)/lib
 LIBDIRNAME = $(wx_top_builddir)/lib

-CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 CLIENT_OBJECTS =  \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 CLIENT_OBJECTS =  \

+       $(__client___win32rc) \

        $(os2_lib_res) \
        $(os2_lib_res) \

-       client_client.o \
-       $(__client___win32rc)
-SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       client_client.o
+SERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \

        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 SERVER_OBJECTS =  \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
        -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
        $(CPPFLAGS) $(CXXFLAGS)
 SERVER_OBJECTS =  \

+       $(__server___win32rc) \

        $(os2_lib_res) \
        $(os2_lib_res) \

-       server_server.o \
-       $(__server___win32rc)
+       server_server.o

 BASECLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 BASECLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)

 BASECLIENT_OBJECTS =  \
        baseclient_baseclient.o
 BASESERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 BASECLIENT_OBJECTS =  \
        baseclient_baseclient.o
 BASESERVER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)

 BASESERVER_OBJECTS =  \
        baseserver_baseserver.o
 
 BASESERVER_OBJECTS =  \
        baseserver_baseserver.o
 


@@ -79,8 +78,7 @@ BASESERVER_OBJECTS =  \
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon

-@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_BUILD_debug@WXDEBUGFLAG = d

 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)


@@ -94,6 +92,7 @@ BASESERVER_OBJECTS =  \
 COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \
        -q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd)
 COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep \
        -q pmwin.763 ; then emxbind -ep client$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__client___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___client___os2_emxbindcmd)

+@COND_PLATFORM_WIN32_1@__client___win32rc = client_sample_rc.o

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     = client.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_bundle___depname = client_bundle
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     = client.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__client_bundle___depname = client_bundle


@@ -107,7 +106,6 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
 @COND_TOOLKIT_OSX_COCOA@       = $(__client_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____client_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@      = $(__client_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_COCOA@       = $(__client_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____client_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@      = $(__client_app_Contents_PkgInfo___depname)

-@COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o

 @COND_USE_GUI_1@__server___depname = server$(EXEEXT)
 @COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \
 @COND_USE_GUI_1@__server___depname = server$(EXEEXT)
 @COND_PLATFORM_MAC_0@__server___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \


@@ -115,6 +113,7 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
 COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
        -q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd)
 COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
        -q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__server___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___server___os2_emxbindcmd)

+@COND_PLATFORM_WIN32_1@__server___win32rc = server_sample_rc.o

 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     = server.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_bundle___depname = server_bundle
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     = server.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__server_bundle___depname = server_bundle


@@ -128,14 +127,16 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
 @COND_TOOLKIT_OSX_COCOA@       = $(__server_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____server_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@      = $(__server_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_COCOA@       = $(__server_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____server_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@      = $(__server_app_Contents_PkgInfo___depname)

-@COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o

 @COND_PLATFORM_MAC_0@__baseclient___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseclient___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL baseclient$(EXEEXT)
 @COND_PLATFORM_MAC_0@__baseclient___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseclient___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL baseclient$(EXEEXT)

+@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)

 @COND_PLATFORM_MAC_0@__baseserver___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseserver___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL baseserver$(EXEEXT)
 @COND_PLATFORM_MAC_0@__baseserver___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__baseserver___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL baseserver$(EXEEXT)

+@COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)

 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__

+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_0 = --define wxDEBUG_LEVEL=0

 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p_0 = --define wxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p_0 = --define wxNO_THREADS


@@ -152,10 +153,8 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
 @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
 @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
 @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
 @COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

-@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
-@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
-@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__

+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0

 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
 @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
 @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS


@@ -169,6 +168,9 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)

+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)

 @COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
 @COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
 @COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
 @COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \


@@ -205,7 +207,6 @@ distclean: clean
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__client___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__client___os2_emxbindcmd)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__client___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__client___os2_emxbindcmd)

-@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)

 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p client.app/Contents
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p client.app/Contents


@@ -234,7 +235,6 @@ distclean: clean
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__server___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__server___os2_emxbindcmd)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__server___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__server___os2_emxbindcmd)

-@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)

 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p server.app/Contents
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p server.app/Contents


@@ -259,29 +259,27 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
 
 baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)
 
 baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)

-       $(CXX) -o $@ $(BASECLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BASECLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)

        
        $(__baseclient___mac_setfilecmd)
        
        $(__baseclient___mac_setfilecmd)

-       $(SAMPLES_RPATH_POSTLINK)

 
 baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
 
 baseserver$(EXEEXT): $(BASESERVER_OBJECTS)

-       $(CXX) -o $@ $(BASESERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(BASESERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p_1) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)

        
        $(__baseserver___mac_setfilecmd)
        
        $(__baseserver___mac_setfilecmd)

-       $(SAMPLES_RPATH_POSTLINK)
+
+client_sample_rc.o: $(srcdir)/../../samples/sample.rc
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

 
 client_client.o: $(srcdir)/client.cpp
        $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $(srcdir)/client.cpp
 
 
 client_client.o: $(srcdir)/client.cpp
        $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $(srcdir)/client.cpp
 

-client_client_rc.o: $(srcdir)/client.rc
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+server_sample_rc.o: $(srcdir)/../../samples/sample.rc
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

 
 server_server.o: $(srcdir)/server.cpp
        $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $(srcdir)/server.cpp
 
 
 server_server.o: $(srcdir)/server.cpp
        $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $(srcdir)/server.cpp
 

-server_server_rc.o: $(srcdir)/server.rc
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
-

 baseclient_baseclient.o: $(srcdir)/baseclient.cpp
        $(CXXC) -c -o $@ $(BASECLIENT_CXXFLAGS) $(srcdir)/baseclient.cpp
 
 baseclient_baseclient.o: $(srcdir)/baseclient.cpp
        $(CXXC) -c -o $@ $(BASECLIENT_CXXFLAGS) $(srcdir)/baseclient.cpp
 


@@ -289,15 +287,6 @@ baseserver_baseserver.o: $(srcdir)/baseserver.cpp
        $(CXXC) -c -o $@ $(BASESERVER_CXXFLAGS) $(srcdir)/baseserver.cpp
 
 
        $(CXXC) -c -o $@ $(BASESERVER_CXXFLAGS) $(srcdir)/baseserver.cpp
 
 

-$(srcdir)/include/wx/stc/stc.h: \
-$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
-$(srcdir)/src/stc/stc.cpp.in \
-$(srcdir)/src/stc/stc.h.in \
-$(srcdir)/src/stc/gen_iface.py
-       cd $(srcdir)/src/stc && ./gen_iface.py
-monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
-$(srcdir)/include/wx/stc/stc.h
-

 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d