X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..8e63b7b8ea9cb46870ab4d26e29c3d4c3b3b99a8:/samples/dataview/Makefile.in

diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index a97ff63e5b..4d1e1ff259 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.4 (http://www.bakefile.org)
+#     Bakefile 0.2.5 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -51,6 +51,7 @@ DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 DATAVIEW_OBJECTS =  \
 	$(__dataview_os2_lib_res) \
 	dataview_dataview.o \
+	dataview_mymodels.o \
 	$(__dataview___win32rc)
 
 ### Conditionally set variables: ###
@@ -173,7 +174,7 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
 @COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >dataview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
-@COND_PLATFORM_MACOSX_1@	ln -f dataview$(EXEEXT) dataview.app/Contents/MacOS/dataview
+@COND_PLATFORM_MACOSX_1@	mv dataview$(EXEEXT) dataview.app/Contents/MacOS/dataview
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	
 @COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns dataview.app/Contents/Resources/wxmac.icns
@@ -183,18 +184,21 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
 dataview_dataview.o: $(srcdir)/dataview.cpp
 	$(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/dataview.cpp
 
+dataview_mymodels.o: $(srcdir)/mymodels.cpp
+	$(CXXC) -c -o $@ $(DATAVIEW_CXXFLAGS) $(srcdir)/mymodels.cpp
+
 dataview_sample_rc.o: $(srcdir)/../sample.rc
 	$(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
 
-$(srcdir)/include/wx/stc/stc.h: \
-$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
-$(srcdir)/src/stc/stc.cpp.in \
-$(srcdir)/src/stc/stc.h.in \
-$(srcdir)/src/stc/gen_iface.py
-	cd $(srcdir)/src/stc && ./gen_iface.py
-monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
-$(srcdir)/include/wx/stc/stc.h
+@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
+@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
+@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
+@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
+@COND_USE_STC_1@	cd $(srcdir)/src/stc && ./gen_iface.py
+@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+@COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d