fixed sending 2 events (normal and bogus cancel one) when ending to edit a tree ctrl...

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

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index cba25fb0b74718c0f5e5d56405cd1e74f5ae9d5d..1cae4ea1d66f2373e4d5b0b6fbf5687a21da3f0c 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -72,6 +72,10 @@ COND_PLATFORM_OS2_1___joytest___os2_emxbindcmd = $(NM) joytest$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__joytest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle
+@COND_TOOLKIT_COCOA@____joytest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   joytest.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____joytest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     joytest.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -98,13 +102,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-       $(srcdir)/../../samples -o joytest$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(srcdir)/../../samples -i $(top_srcdir)/include -o joytest$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -133,7 +137,7 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
        $(__joytest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p joytest.app/Contents
        mkdir -p joytest.app/Contents/MacOS
        mkdir -p joytest.app/Contents/Resources
@@ -142,7 +146,7 @@ joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/joytest/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >joytest.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >joytest.app/Contents/Info.plist
        
        
        echo -n "APPL????" >joytest.app/Contents/PkgInfo
@@ -151,16 +155,16 @@ joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
        ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc joytest.app/Contents/Resources/joytest.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc joytest.app/Contents/Resources/joytest.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns joytest.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@joytest_bundle: joytest.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@joytest_bundle: $(____joytest_BUNDLE_TGT_REF_DEP)
 
 joytest_joytest.o: $(srcdir)/joytest.cpp
        $(CXXC) -c -o $@ $(JOYTEST_CXXFLAGS) $<
 
 joytest_joytest_rc.o: $(srcdir)/joytest.rc
-       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
 
 
 # Include dependency info, if present: