X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ceec2216bd3c65103e51a4ed9927f90fc1291d9c..21b2dde583e83d3ad455c20fa8db717037b5f548:/samples/html/help/Makefile.in

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index 6e3c7a7cfe..4f6aa1ffe6 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,46 +11,51 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
+BK_DEPS = @BK_DEPS@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
+LIBS = @LIBS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
+wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.2
-WX_RELEASE = 2.5
-LIBDIRNAME = $(top_builddir)lib
-HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-	$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
-HELP_OBJECTS =  \
-	$(__help_os2_lib_res) \
-	help_help.o \
-	$(__help___win32rc)
+WX_RELEASE = 2.9
+WX_VERSION = $(WX_RELEASE).0
+LIBDIRNAME = $(wx_top_builddir)/lib
+HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
+	$(CXXFLAGS)
+HTMLHELP_OBJECTS =  \
+	$(__htmlhelp_os2_lib_res) \
+	htmlhelp_help.o \
+	$(__htmlhelp___win32rc)
 
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -58,35 +63,54 @@ HELP_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \
-@COND_PLATFORM_MAC_1@	$(SETFILE) -a C help$(EXEEXT)
-@COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
+@COND_PLATFORM_MAC_1@__htmlhelp___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@	$(SETFILE) -a C htmlhelp$(EXEEXT)
+@COND_PLATFORM_MAC_1@__htmlhelp___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \
-	pmwin.763 ; then emxbind -ep help$(EXEEXT) ; fi
-@COND_PLATFORM_OS2_1@__help___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___help___os2_emxbindcmd)
-@COND_PLATFORM_OS2_1@__help_os2_lib_res = \
+COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep htmlhelp$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__htmlhelp___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_OS2_1@__htmlhelp_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_PLATFORM_MACOSX_1@__htmlhelp_bundle___depname = htmlhelp_bundle
+@COND_TOOLKIT_COCOA@____htmlhelp_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	htmlhelp.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____htmlhelp_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	htmlhelp.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-2.5$(HOST_SUFFIX)
+	-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_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
-@COND_PLATFORM_WIN32_1@__help___win32rc = help_help_rc.o
+@COND_PLATFORM_WIN32_1@__htmlhelp___win32rc = htmlhelp_help_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
@@ -100,21 +124,22 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-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).2.r sample.r
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
+	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
+	$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+	$(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+	htmlhelp$(EXEEXT) Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 
-all: help$(EXEEXT) $(__help_bundle___depname) data
+all: htmlhelp$(EXEEXT) $(__htmlhelp_bundle___depname) data
 
 install: all
 
@@ -125,58 +150,61 @@ install-strip: install
 clean: 
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f help$(EXEEXT)
-	rm -rf help.app
+	rm -f htmlhelp$(EXEEXT)
+	rm -rf htmlhelp.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
 
-help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
-	$(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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) $(EXTRALIBS_GUI)
-	$(__help___mac_rezcmd)
-	$(__help___mac_setfilecmd)
-	$(__help___os2_emxbindcmd)
+htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
+	$(CXX) -o $@ $(HTMLHELP_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+	$(__htmlhelp___mac_rezcmd)
+	$(__htmlhelp___mac_setfilecmd)
+	$(__htmlhelp___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-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
+htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+	mkdir -p htmlhelp.app/Contents
+	mkdir -p htmlhelp.app/Contents/MacOS
+	mkdir -p htmlhelp.app/Contents/Resources
 	
 	
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/help/" \
+	-e "s/EXECUTABLE/htmlhelp/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
 	
 	
-	echo -n "APPL????" >help.app/Contents/PkgInfo
+	echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo
 	
 	
-	ln -f help$(EXEEXT) help.app/Contents/MacOS/help
+	ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
 	
 	
-	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
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP)
+@COND_PLATFORM_MACOSX_1@htmlhelp_bundle: $(____htmlhelp_BUNDLE_TGT_REF_DEP)
 
 data: 
 	@mkdir -p ./helpfiles
 	@for f in Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp; do \
-	if test \( ! -s ./helpfiles/$$f \) -o \( $(srcdir)/helpfiles/$$f -nt ./helpfiles/$$f  \) ; then \
-	cp -pRf $(srcdir)/helpfiles/$$f ./helpfiles ; \
+	if test ! -f ./helpfiles/$$f -a ! -d ./helpfiles/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/helpfiles/$$f -newer ./helpfiles/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/helpfiles/$$f ./helpfiles ;; \
+	esac; \
 	done
 
-help_help.o: $(srcdir)/help.cpp
-	$(CXXC) -c -o $@ $(HELP_CXXFLAGS) $<
+htmlhelp_help.o: $(srcdir)/help.cpp
+	$(CXXC) -c -o $@ $(HTMLHELP_CXXFLAGS) $(srcdir)/help.cpp
 
-help_help_rc.o: $(srcdir)/help.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
+htmlhelp_help_rc.o: $(srcdir)/help.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
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean help_bundle data
+.PHONY: all install uninstall clean distclean htmlhelp_bundle data