Applied OpenWatcom fixes from ABX.

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

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 52ab96f3147d7036f29c235268e2420e25fe8eb1..a9d98b6b3486d47a3e3b7e8a156255566300b49f 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -13,6 +13,7 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
@@ -37,6 +38,8 @@ LIBDIRNAME = $(top_builddir)lib
 
 ### 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
@@ -70,24 +73,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__console___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL console
+@COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL console$(EXEEXT)
 
 ### Targets: ###
 
-all: console data
+all: console$(EXEEXT) data
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f console
+       rm -f console$(EXEEXT)
 
-console: $(CONSOLE_OBJECTS)
+console$(EXEEXT): $(CONSOLE_OBJECTS)
        $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(__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)
        
        $(__console___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK)
 
 console_console.o: $(srcdir)/console.cpp
-       $(CXX) -c -o $@ $(CONSOLE_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $<
 
 data: 
        @mkdir -p .