Cleaned up some comments, reorganized some code

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

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index 079dc7c436e9348931f4cbe72a82109d3804b186..eed4f4d557a50c7644a846c8171d214cc987d678 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/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
@@ -72,7 +75,7 @@ WX_VERSION = 2.5.0
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 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 -o treectrl Carbon.r \
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o treectrl$(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 = \
@@ -87,18 +90,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@__treectrl___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = $(SETFILE) -a C treectrl
+@COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C treectrl$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o
 @COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle
 
 ### Targets: ###
 
-all: treectrl $(__treectrl_bundle___depname)
+all: treectrl$(EXEEXT) $(__treectrl_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f treectrl
+       rm -f treectrl$(EXEEXT)
        rm -rf treectrl.app
 
 distclean: clean
@@ -108,13 +112,13 @@ install: all
 
 install-strip: install
 
-treectrl: $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
+treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
        $(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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)
        $(__treectrl___mac_rezcmd)
        $(__treectrl___mac_setfilecmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-treectrl.app/Contents: treectrl $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p treectrl.app/Contents
        mkdir -p treectrl.app/Contents/MacOS
        mkdir -p treectrl.app/Contents/Resources
@@ -129,16 +133,16 @@ treectrl.app/Contents: treectrl $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME
        echo -n "APPL????" >treectrl.app/Contents/PkgInfo
        
        
-       ln -f treectrl treectrl.app/Contents/MacOS/treectrl
+       ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl
        
        
        ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treectrl.app/Contents/Resources/treectrl.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@treectrl_bundle: treectrl.app/Contents
+@COND_PLATFORM_MACOSX_1@treectrl_bundle: treectrl.app/Contents/PkgInfo
 
 treectrl_treetest.o: $(srcdir)/treetest.cpp
-       $(CXX) -c -o $@ $(TREECTRL_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $<
 
 treectrl_treetest_rc.o: $(srcdir)/treetest.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