link against oleacc.lib (needed by wxUSE_ACCESSIBILITY)

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

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 93ca55372a09ea2f66f674ad7e6251ace54313ff..50ecc428826495b2439912465cb50e00771fc8a3 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -34,20 +34,19 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 CLIENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
+       -I$(srcdir)/../../samples $(CXXFLAGS)
 CLIENT_OBJECTS =  \
        client_client.o \
        $(__client___win32rc)
 LIBDIRNAME = $(top_builddir)lib
 SERVER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
+       -I$(srcdir)/../../samples $(CXXFLAGS)
 SERVER_OBJECTS =  \
        server_server.o \
        $(__server___win32rc)
+WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
@@ -63,34 +62,6 @@ SERVER_OBJECTS =  \
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_0 = --define WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_6 = -d WXUSINGDLL
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_0 = \
-@COND_WXUSE_EXPAT_BUILTIN@     --include-dir $(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_6 = -i $(top_srcdir)/src/expat/lib
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_0 = \
-@COND_WXUSE_LIBJPEG_BUILTIN@   --include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_6 = -i $(top_srcdir)/src/jpeg
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_0 = -i $(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_6 = \
-@COND_WXUSE_ODBC_BUILTIN@      --include-dir $(top_srcdir)/src/odbc
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_0 = \
-@COND_WXUSE_LIBPNG_BUILTIN@    --include-dir $(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_6 = -i $(top_srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_0 = -i $(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_6 = \
-@COND_WXUSE_REGEX_BUILTIN@     --include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_0 = -i $(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_6 = \
-@COND_WXUSE_LIBTIFF_BUILTIN@   --include-dir $(top_srcdir)/src/tiff
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_0 = -i $(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_6 = \
-@COND_WXUSE_ZLIB_BUILTIN@      --include-dir $(top_srcdir)/src/zlib
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
@@ -109,16 +80,12 @@ SERVER_OBJECTS =  \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \
-       $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \
-       $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \
        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.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) -i $(top_srcdir)/include \
-       $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \
-       $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \
        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3)
@@ -164,7 +131,7 @@ client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
        $(__client___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+client.app/Contents/PkgInfo: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p client.app/Contents
        mkdir -p client.app/Contents/MacOS
        mkdir -p client.app/Contents/Resources
@@ -172,7 +139,7 @@ client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/client/" \
-       -e "s/VERSION/2.5.0/" \
+       -e "s/VERSION/$(WX_VERSION)/" \
        $(top_srcdir)/src/mac/Info.plist.in >client.app/Contents/Info.plist
        
        
@@ -185,13 +152,13 @@ client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents
+@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents/PkgInfo
 
 client_client.o: $(srcdir)/client.cpp
        $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $<
 
 client_client_rc.o: $(srcdir)/client.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -206,7 +173,7 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
        $(__server___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+server.app/Contents/PkgInfo: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p server.app/Contents
        mkdir -p server.app/Contents/MacOS
        mkdir -p server.app/Contents/Resources
@@ -214,7 +181,7 @@ server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/server/" \
-       -e "s/VERSION/2.5.0/" \
+       -e "s/VERSION/$(WX_VERSION)/" \
        $(top_srcdir)/src/mac/Info.plist.in >server.app/Contents/Info.plist
        
        
@@ -227,13 +194,13 @@ server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDI
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents
+@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents/PkgInfo
 
 server_server.o: $(srcdir)/server.cpp
        $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $<
 
 server_server_rc.o: $(srcdir)/server.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples
 
 uninstall: