Misc. corrections

[wxWidgets.git] / samples / html / helpview / Makefile.in

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 60c33df10028f5661e8133b1540e76bbd7cc484c..ccccf647d49239056215b13c1a6fde65e6226285 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 SETFILE = @SETFILE@
 TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 TOOLKIT = @TOOLKIT@
@@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@
 HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS)
 HELPVIEW_OBJECTS =  \
        helpview_helpview.o \
        $(__helpview___win32rc)
@@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
        $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
        $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
-       $(__DLLFLAG_p_1) -o helpview$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r
+       $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C helpview$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_helpview_rc.o
+@COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle
 
 ### Targets: ###
 
-all: helpview$(EXEEXT) data
+all: helpview$(EXEEXT) $(__helpview_bundle___depname) data
 
 clean: 
-       rm -rf ./.deps
+       rm -rf ./.deps ./.pch
        rm -f ./*.o
        rm -f helpview$(EXEEXT)
+       rm -rf helpview.app
 
 data: 
        @mkdir -p .
@@ -144,19 +147,42 @@ data:
        done
 
 distclean: clean
-       rm -f configure config.cache config.log config.status
-       rm -f bk-deps shared-ld-sh
+       rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
        $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(__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)
        $(__helpview___mac_rezcmd)
        $(__helpview___mac_setfilecmd)
+       $(SAMPLES_RPATH_POSTLINK)
+
+helpview.app/Contents: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+       mkdir -p helpview.app/Contents
+       mkdir -p helpview.app/Contents/MacOS
+       mkdir -p helpview.app/Contents/Resources
+       
+       
+       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+       -e "s/EXECUTABLE/helpview/" \
+       -e "s/VERSION/2.5.0/" \
+       $(top_srcdir)/src/mac/Info.plist.in >helpview.app/Contents/Info.plist
+       
+       
+       echo -n "APPL????" >helpview.app/Contents/PkgInfo
+       
+       
+       ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
+       
+       
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc helpview.app/Contents/Resources/helpview.rsrc
+       ln -f $(top_srcdir)/src/mac/wxmac.icns helpview.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@helpview_bundle: helpview.app/Contents
 
 helpview_helpview.o: $(srcdir)/helpview.cpp
        $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $<
 
 helpview_helpview_rc.o: $(srcdir)/helpview.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
+       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples
 
 install: all
 
@@ -168,4 +194,4 @@ uninstall:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install uninstall
+.PHONY: all clean data distclean helpview_bundle install uninstall