Cleaned up some comments, reorganized some code

[wxWidgets.git] / contrib / samples / deprecated / treelay / Makefile.in

diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in
index 08d6d00e29bbee9ab5a5c4842ff32d52886216e3..5a5b1a8676ca9d91548addac41cd0bd809fd82b7 100644 (file)
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/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@
@@ -43,6 +44,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
@@ -73,7 +76,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
        $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \
-       $(srcdir)/../../../include -o treelay Carbon.r \
+       $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r \
        $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@@ -88,18 +91,19 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__treelay___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = $(SETFILE) -a C treelay
+@COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C treelay$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__treelay___win32rc = treelay_treelay_rc.o
 @COND_PLATFORM_MACOSX_1@__treelay_bundle___depname = treelay_bundle
 
 ### Targets: ###
 
-all: treelay $(__treelay_bundle___depname)
+all: treelay$(EXEEXT) $(__treelay_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f treelay
+       rm -f treelay$(EXEEXT)
        rm -rf treelay.app
 
 distclean: clean
@@ -109,13 +113,13 @@ install: all
 
 install-strip: install
 
-treelay: $(TREELAY_OBJECTS) $(__treelay___win32rc)
+treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
        $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_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)
        $(__treelay___mac_rezcmd)
        $(__treelay___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-treelay.app/Contents: treelay $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p treelay.app/Contents
        mkdir -p treelay.app/Contents/MacOS
        mkdir -p treelay.app/Contents/Resources
@@ -130,16 +134,16 @@ treelay.app/Contents: treelay $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/
        echo -n "APPL????" >treelay.app/Contents/PkgInfo
        
        
-       ln -f treelay treelay.app/Contents/MacOS/treelay
+       ln -f treelay$(EXEEXT) treelay.app/Contents/MacOS/treelay
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treelay.app/Contents/Resources/treelay.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns treelay.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@treelay_bundle: treelay.app/Contents
+@COND_PLATFORM_MACOSX_1@treelay_bundle: treelay.app/Contents/PkgInfo
 
 treelay_treelay.o: $(srcdir)/treelay.cpp
-       $(CXX) -c -o $@ $(TREELAY_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 treelay_treelay_rc.o: $(srcdir)/treelay.rc
        $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include