added wxDIB(HBITMAP) ctor and corresponding Create(); made GetData() return uchar...

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

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index f03f46fe30bd486a95961bdc10e69a3ef6eed0cf..001c9a1aba1c201c4fef9c7618c9d5bcb5df1bf0 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (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
 HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -71,6 +71,8 @@ COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__help_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle
+@COND_TOOLKIT_COCOA@____help_BUNDLE_TGT_REF_DEP = help.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____help_BUNDLE_TGT_REF_DEP = help.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -103,12 +105,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_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 help$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 
-all: help$(EXEEXT) $(__help_bundle___depname)
+all: help$(EXEEXT) $(__help_bundle___depname) data
 
 install: all
 
@@ -132,7 +134,7 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
        $(__help___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p help.app/Contents
        mkdir -p help.app/Contents/MacOS
        mkdir -p help.app/Contents/Resources
@@ -141,7 +143,7 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/help/" \
        -e "s/VERSION/$(WX_VERSION)/" \
-       $(top_srcdir)/src/mac/Info.plist.in >help.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist
        
        
        echo -n "APPL????" >help.app/Contents/PkgInfo
@@ -150,10 +152,22 @@ help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f help$(EXEEXT) help.app/Contents/MacOS/help
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc help.app/Contents/Resources/help.rsrc
-       ln -sf $(top_srcdir)/src/mac/wxmac.icns help.app/Contents/Resources/wxmac.icns
-
-@COND_PLATFORM_MACOSX_1@help_bundle: help.app/Contents/PkgInfo
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc help.app/Contents/Resources/help.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP)
+
+data: 
+       @mkdir -p ./doc
+       @for f in aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \
+       if test ! -e ./doc/$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/doc/$$f -newer ./doc/$$f -print` ; \
+       fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/doc/$$f ./doc ;; \
+       esac; \
+       done
 
 help_demo.o: $(srcdir)/demo.cpp
        $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $<
@@ -165,4 +179,4 @@ help_demo_rc.o: $(srcdir)/demo.rc
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean help_bundle
+.PHONY: all install uninstall clean distclean help_bundle data