corrected wxMMedia description (forgot to commit before)

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

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index a3aa54bee134345dc1df39469d7dc1f4a2b5218c..60ee087d1b1227d4801801d291ffcfbc6b4d8f7a 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -36,8 +35,8 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).5
+WX_RELEASE = 2.6
+WX_VERSION = $(WX_RELEASE).0
 LIBDIRNAME = $(top_builddir)lib
 CLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -97,13 +96,13 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \
        $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o client$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) \
        $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) -i $(srcdir) $(__DLLFLAG_p_0) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o server$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.r sample.r
+       sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__
@@ -180,7 +179,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
        $(__client___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p client.app/Contents
        mkdir -p client.app/Contents/MacOS
        mkdir -p client.app/Contents/Resources
@@ -198,7 +197,6 @@ client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
        ln -f client$(EXEEXT) client.app/Contents/MacOS/client
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc client.app/Contents/Resources/client.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns client.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
@@ -210,7 +208,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
        $(__server___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p server.app/Contents
        mkdir -p server.app/Contents/MacOS
        mkdir -p server.app/Contents/Resources
@@ -228,7 +226,6 @@ server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
        ln -f server$(EXEEXT) server.app/Contents/MacOS/server
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).5.rsrc server.app/Contents/Resources/server.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns server.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@server_bundle: $(____server_BUNDLE_TGT_REF_DEP)