Fixed compile error (seen on OS/2).

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

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index f08ca855265ee1fc4750938419feace250b92999..04ed4b298d9efab22a6bdce2bfb9b127cdedd39e 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -13,6 +13,7 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -49,6 +50,8 @@ WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -78,12 +81,12 @@ WX_VERSION = 2.5.0
 @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 -i $(srcdir) \
-       $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client Carbon.r \
+       $(__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 -i $(srcdir) \
-       $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server Carbon.r \
+       $(__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)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@@ -100,33 +103,35 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_6 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__client___mac_rezcmd = $(__MACOSX_RESOURCES_p_2)
-@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = $(SETFILE) -a C client
+@COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C client$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__client___win32rc = client_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle
 @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3)
-@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = $(SETFILE) -a C server
+@COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C server$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__server___win32rc = server_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle
 
 ### Targets: ###
 
-all: client $(__client_bundle___depname) server $(__server_bundle___depname)
+all: client$(EXEEXT) $(__client_bundle___depname) server$(EXEEXT) $(__server_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f client
+       rm -f client$(EXEEXT)
        rm -rf client.app
-       rm -f server
+       rm -f server$(EXEEXT)
        rm -rf server.app
 
-client: $(CLIENT_OBJECTS) $(__client___win32rc)
+client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc)
        $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__client___mac_rezcmd)
        $(__client___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-client.app/Contents: client $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+client.app/Contents: 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
@@ -141,7 +146,7 @@ client.app/Contents: client $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/li
        echo -n "APPL????" >client.app/Contents/PkgInfo
        
        
-       ln -f client client.app/Contents/MacOS/client
+       ln -f client$(EXEEXT) client.app/Contents/MacOS/client
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc
@@ -150,7 +155,7 @@ client.app/Contents: client $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/li
 @COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents
 
 client_client.o: $(srcdir)/client.cpp
-       $(CXX) -c -o $@ $(CLIENT_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $<
 
 client_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(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
@@ -162,13 +167,13 @@ install: all
 
 install-strip: install
 
-server: $(SERVER_OBJECTS) $(__server___win32rc)
+server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
        $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        $(__server___mac_rezcmd)
        $(__server___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-server.app/Contents: server $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+server.app/Contents: 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
@@ -183,7 +188,7 @@ server.app/Contents: server $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/li
        echo -n "APPL????" >server.app/Contents/PkgInfo
        
        
-       ln -f server server.app/Contents/MacOS/server
+       ln -f server$(EXEEXT) server.app/Contents/MacOS/server
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc
@@ -195,7 +200,7 @@ server_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(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
 
 server_server.o: $(srcdir)/server.cpp
-       $(CXX) -c -o $@ $(SERVER_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $<
 
 uninstall: