Register multibutton editor class in frame ctor instead of CreateGrid() (this fixes...

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

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 85be4c8725ad4768a6b29e779ed078319cf3c247..56b94ae6515f220306e1d73db7834a1862e734b9 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -91,10 +91,16 @@ COND_PLATFORM_OS2_1___vstest___os2_emxbindcmd = $(NM) vstest$(EXEEXT) | if grep
 @COND_PLATFORM_MACOSX_1@__vstest_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = vstest.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle
-@COND_TOOLKIT_COCOA@____vstest_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@   $(__vstest_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_MAC@____vstest_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     $(__vstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____vstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__vstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____vstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__vstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____vstest_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__vstest_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____vstest_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__vstest_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -141,7 +147,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
-       $(CXX) -o $@ $(VSTEST_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+       $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        
        $(__vstest___mac_setfilecmd)
        $(__vstest___os2_emxbindcmd)
@@ -186,6 +192,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
-@IF_GNU_MAKE@-include ./.deps/*.d
+@IF_GNU_MAKE@-include .deps/*.d
 
 .PHONY: all install uninstall clean distclean vstest_bundle