select current column when Ctrl-Space is pressed; the current row when Shift-Space...

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

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index e0e06dc8671039f5650340f2936ad4811f808049..2e1e348dc8f6c011240128f1f534faa329edd23a 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -90,10 +90,14 @@ COND_PLATFORM_OS2_1___caret___os2_emxbindcmd = $(NM) caret$(EXEEXT) | if grep -q
 @COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = caret.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle
 @COND_PLATFORM_MACOSX_1@__caret_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1@       = caret.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle

+@COND_TOOLKIT_OSX_CARBON@____caret_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@      = $(__caret_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____caret_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@       = $(__caret_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____caret_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__caret_app_Contents_PkgInfo___depname)

 @COND_TOOLKIT_COCOA@____caret_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__caret_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____caret_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@   $(__caret_app_Contents_PkgInfo___depname)

-@COND_TOOLKIT_MAC@____caret_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_MAC@     $(__caret_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)
 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 +145,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)

-       $(CXX) -o $@ $(CARET_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 $@ $(CARET_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)

        
        $(__caret___mac_setfilecmd)
        $(__caret___os2_emxbindcmd)
        
        $(__caret___mac_setfilecmd)
        $(__caret___os2_emxbindcmd)


@@ -186,6 +190,6 @@ monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
 $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
 $(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 caret_bundle
 
 .PHONY: all install uninstall clean distclean caret_bundle