]> git.saurik.com Git - wxWidgets.git/blobdiff - samples/dialogs/Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...
[wxWidgets.git] / samples / dialogs / Makefile.in
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index 824bbd0ed1ea278daed4c3df1fc414a72ced6a33..49721ff0ba626c94971a615ec90cc4f57d122d1f 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -39,14 +39,14 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 DESTDIR = 
 WX_RELEASE = 2.5
 
 DESTDIR = 
 WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).3
+WX_VERSION = $(WX_RELEASE).4
 LIBDIRNAME = $(top_builddir)lib
 DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \
        $(__dialogs_os2_lib_res) \
        dialogs_dialogs.o \
 LIBDIRNAME = $(top_builddir)lib
 DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \
        $(__dialogs_os2_lib_res) \
        dialogs_dialogs.o \
-       $(__GENERIC_FILES_OBJECTS) \
+       $(__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS) \
        $(__dialogs___win32rc)
 
 ### Conditionally set variables: ###
        $(__dialogs___win32rc)
 
 ### Conditionally set variables: ###
@@ -85,13 +85,13 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \
 @COND_TOOLKIT_COCOA@   dialogs.app/Contents/PkgInfo
 @COND_TOOLKIT_MAC@____dialogs_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     dialogs.app/Contents/PkgInfo
 @COND_TOOLKIT_COCOA@   dialogs.app/Contents/PkgInfo
 @COND_TOOLKIT_MAC@____dialogs_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@     dialogs.app/Contents/PkgInfo
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@__GENERIC_FILES_OBJECTS \
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   = dialogs_colrdlgg.o dialogs_dirdlgg.o \
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   dialogs_filedlgg.o dialogs_fontdlgg.o
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   = dialogs_colrdlgg.o dialogs_dirdlgg.o \
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   dialogs_filedlgg.o dialogs_fontdlgg.o
-@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@__GENERIC_FILES_OBJECTS \
+@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   = dialogs_colrdlgg.o dialogs_dirdlgg.o \
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   dialogs_filedlgg.o
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   = dialogs_colrdlgg.o dialogs_dirdlgg.o \
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   dialogs_filedlgg.o
-@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@__GENERIC_FILES_OBJECTS \
+@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@    = dialogs_fontdlgg.o dialogs_filedlgg.o
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@    = dialogs_fontdlgg.o dialogs_filedlgg.o
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -127,7 +127,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 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 -i $(top_srcdir)/include -o dialogs$(EXEEXT) Carbon.r \
 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 -i $(top_srcdir)/include -o dialogs$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -147,7 +147,7 @@ clean:
        rm -rf dialogs.app
 
 distclean: clean
        rm -rf dialogs.app
 
 distclean: clean
-       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+       rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
        $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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_FOR_BASE) $(EXTRALIBS_FOR_GUI)
 
 dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
        $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__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_FOR_BASE) $(EXTRALIBS_FOR_GUI)
@@ -156,7 +156,7 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
        $(__dialogs___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__dialogs___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p dialogs.app/Contents
        mkdir -p dialogs.app/Contents/MacOS
        mkdir -p dialogs.app/Contents/Resources
        mkdir -p dialogs.app/Contents
        mkdir -p dialogs.app/Contents/MacOS
        mkdir -p dialogs.app/Contents/Resources
@@ -174,7 +174,7 @@ dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
        ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs
        
        
        ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dialogs.app/Contents/Resources/dialogs.rsrc
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc dialogs.app/Contents/Resources/dialogs.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dialogs_bundle: $(____dialogs_BUNDLE_TGT_REF_DEP)
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dialogs_bundle: $(____dialogs_BUNDLE_TGT_REF_DEP)
@@ -182,43 +182,47 @@ dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info
 data: 
        @mkdir -p .
        @for f in tips.txt; do \
 data: 
        @mkdir -p .
        @for f in tips.txt; do \
-       if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
-       cp -pRf $(srcdir)/$$f . ; \
+       if test ! -e ./$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
        fi; \
        fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/$$f . ;; \
+       esac; \
        done
 
 dialogs_dialogs.o: $(srcdir)/dialogs.cpp
        done
 
 dialogs_dialogs.o: $(srcdir)/dialogs.cpp
-       $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/dialogs.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/colrdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp
-@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/colrdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/dirdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@dialogs_dirdlgg.o: $(srcdir)/../../src/generic/dirdlgg.cpp
-@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/dirdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
-@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp
-@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@    $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@    $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
-@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@   $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
 
 @COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp
-@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@    $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $<
+@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@    $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp
 
 dialogs_dialogs_rc.o: $(srcdir)/dialogs.rc
 
 dialogs_dialogs_rc.o: $(srcdir)/dialogs.rc
-       $(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
+       $(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:
 
 
 # Include dependency info, if present:
wxWidgets (Impactor)