Rebake after last change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 280a2cb067979d3519e4df3f5838c60d53b14049..b0a06b0cd67386e8756e387404ea66cda351f90c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,6 +66,8 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
+DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
+DYLIB_RPATH_POSTLINK = @DYLIB_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -12497,6 +12499,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
        $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
        (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+       $(DYLIB_RPATH_INSTALL)
        $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
        for f in setup.h $(RCDEFS_H); do \
        if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
@@ -12719,6 +12722,7 @@ distclean: clean
 
 @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
 @COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
+@COND_MONOLITHIC_1_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_1_SHARED_1@   
 @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
 
@@ -12753,6 +12757,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__basedll___win32rc)
 @COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS)    -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
 
@@ -12789,6 +12794,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__netdll___win32rc) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
 
@@ -12825,6 +12831,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__coredll___win32rc) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
 
@@ -12861,6 +12868,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__advdll___win32rc) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
 
@@ -12897,6 +12905,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__mediadll___win32rc) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_MEDIA) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(__mediadll___so_symlinks_cmd)
 
@@ -12933,6 +12942,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__htmldll___win32rc) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(__htmldll___so_symlinks_cmd)
 
@@ -12969,6 +12979,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__qadll___win32rc) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(__qadll___so_symlinks_cmd)
 
@@ -13005,6 +13016,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xmldll___win32rc) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1@   
 @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
 
@@ -13041,6 +13053,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xrcdll___win32rc) $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR)    -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__htmldll_library_link_LIBR_0) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
 
@@ -13077,6 +13090,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__auidll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(SHARED_LD_CXX) $@ $(AUIDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__auidll___macinstnamecmd) $(__auidll___importlib) $(__auidll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(__auidll___so_symlinks_cmd)
 
@@ -13113,6 +13127,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__propgriddll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(SHARED_LD_CXX) $@ $(PROPGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__propgriddll___macinstnamecmd) $(__propgriddll___importlib) $(__propgriddll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    
 @COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(__propgriddll___so_symlinks_cmd)
 
@@ -13149,6 +13164,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__richtextdll___win32rc) $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(SHARED_LD_CXX) $@ $(RICHTEXTDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) $(__htmldll_library_link_LIBR_0) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    
 @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(__richtextdll___so_symlinks_cmd)
 
@@ -13185,6 +13201,7 @@ distclean: clean
 
 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__stcdll___win32rc) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(DYLIB_RPATH_POSTLINK)
 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ 
 @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(__stcdll___so_symlinks_cmd)
 
@@ -13221,6 +13238,7 @@ distclean: clean
 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(DYLIB_RPATH_POSTLINK)
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 

diff --git a/configure b/configure
index a03a8a96da358473308bfc31d2781cb8fdc4c1fa..e8015b9cdac4ca5a6fd22fb175b1a14faa7e6cba 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 59381 2009-03-06 20:06:59Z VZ .
+# From configure.in Id: configure.in 59458 2009-03-09 22:41:02Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -750,8 +750,9 @@ DEBUG_INFO
 DEBUG_FLAG
 TOOLKIT_LOWERCASE
 TOOLKIT_VERSION
+DYLIB_RPATH_INSTALL
+DYLIB_RPATH_POSTLINK
 SAMPLES_RPATH_FLAG
-SAMPLES_RPATH_POSTLINK
 HEADER_PAD_OPTION
 HOST_SUFFIX
 CPPUNIT_CFLAGS
@@ -2611,7 +2612,8 @@ DEFAULT_DEFAULT_wxUSE_DFB=0
 
 PROGRAM_EXT=
 SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
 
 DEFAULT_STD_FLAG=yes
 
@@ -33892,17 +33894,19 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       *-*-darwin* )
         install_name_tool=`which ${HOST_PREFIX}install_name_tool`
         if test "$install_name_tool" -a -x "$install_name_tool"; then
-            SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
             cat <<EOF >change-install-names
 #!/bin/sh
 libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
-inst_cmd="${HOST_PREFIX}install_name_tool "
 for i in \${libnames} ; do
-    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+    for dep in \${libnames} ; do
+        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+    done
 done
-\${inst_cmd} \${3}
 EOF
             chmod +x change-install-names
+            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
         fi
 
                                         HEADER_PAD_OPTION="-headerpad_max_install_names"
@@ -33923,7 +33927,7 @@ EOF
 
     if test $wxUSE_RPATH = "no"; then
         SAMPLES_RPATH_FLAG=''
-        SAMPLES_RPATH_POSTLINK=''
+        DYLIB_PATH_POSTLINK=''
         WXCONFIG_RPATH=''
     fi
 
@@ -47454,6 +47458,7 @@ fi
 
 
 
+
 case "$TOOLKIT" in
     GTK)
         TOOLKIT_DESC="GTK+"
@@ -51974,8 +51979,9 @@ DEBUG_INFO!$DEBUG_INFO$ac_delim
 DEBUG_FLAG!$DEBUG_FLAG$ac_delim
 TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
 TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim
+DYLIB_RPATH_INSTALL!$DYLIB_RPATH_INSTALL$ac_delim
+DYLIB_RPATH_POSTLINK!$DYLIB_RPATH_POSTLINK$ac_delim
 SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim
-SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim
 HEADER_PAD_OPTION!$HEADER_PAD_OPTION$ac_delim
 HOST_SUFFIX!$HOST_SUFFIX$ac_delim
 CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
@@ -52033,7 +52039,6 @@ GCC_PCH!$GCC_PCH$ac_delim
 ICC_PCH!$ICC_PCH$ac_delim
 ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
 ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
-BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52075,6 +52080,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
 COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
 COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
 COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
@@ -52171,7 +52177,6 @@ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBP
 COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
 COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
 COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
-COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52213,6 +52218,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
 COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
 COND_SHARED_1!$COND_SHARED_1$ac_delim
 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
@@ -52309,7 +52315,6 @@ AFMINSTALL!$AFMINSTALL$ac_delim
 WIN32INSTALL!$WIN32INSTALL$ac_delim
 TOOLKIT!$TOOLKIT$ac_delim
 TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
-TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52351,6 +52356,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
 TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
 cross_compiling!$cross_compiling$ac_delim
 WIDGET_SET!$WIDGET_SET$ac_delim
@@ -52388,7 +52394,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index 5bfc3b04941223888447f7320da9c68312063020..369959a47ecf4a21cacaac64d02893bc1cf17951 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -153,7 +152,6 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
        
        $(__bombs___mac_setfilecmd)
        $(__bombs___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p bombs.app/Contents

diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 575229cd529c77a0a473d5b1dfa0f7d7e6700c8b..a35836db6a8dd5334ac06092f18283e61c3f2969 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -37,7 +37,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -171,7 +170,6 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
        
        $(__forty___mac_setfilecmd)
        $(__forty___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p forty.app/Contents

diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 8f815b6c93f8824c35d3fbc10b41088687d0a3ef..24eac5407640c5b63e0559636fe72d85fd827e9d 100644 (file)
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
        
        $(__fractal___mac_setfilecmd)
        $(__fractal___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p fractal.app/Contents

diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index 4cda96c39f69834222c1984cf436958cc75ac2f5..10411b3893fbc44b0f85565cabf28e11fee54c3f 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -154,7 +153,6 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
        
        $(__life___mac_setfilecmd)
        $(__life___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p life.app/Contents

diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index 79c4f01b19fafa52f4fe62dc60fff00ad2e7ed02..765255e9c55c41a713496f87f399f9fff650fde8 100644 (file)
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
        
        $(__wxpoem___mac_setfilecmd)
        $(__wxpoem___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p wxpoem.app/Contents

diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index 9565a53a1c6fe6dda490b7f725346c019bcfae02..efaf598e6d49de6749cb0320c4ccd610bb8f830d 100644 (file)
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc)
        
        $(__accesstest___mac_setfilecmd)
        $(__accesstest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@accesstest.app/Contents/PkgInfo: accesstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p accesstest.app/Contents

diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index dc370cf54511942f817162bc3ab04ac71a6b12d7..7a26d582d2146681a25bcea5113d0caf1e920d96 100644 (file)
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
        
        $(__anitest___mac_setfilecmd)
        $(__anitest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p anitest.app/Contents

diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index 1711786310737a0df2009eff25c6273d7bb59f2c..9960b22f9b4151893ccc9c402671dc4bb4fecc21 100644 (file)
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -152,7 +151,6 @@ arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc)
        
        $(__arttest___mac_setfilecmd)
        $(__arttest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@arttest.app/Contents/PkgInfo: arttest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p arttest.app/Contents

diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index 40824ce35447246d5d026b588b0f809534f170b2..05f2cc4b7202dc4e3883c86838f7bdfb95af8bac 100644 (file)
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -37,7 +37,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -167,7 +166,6 @@ auidemo$(EXEEXT): $(AUIDEMO_OBJECTS) $(__auidemo___win32rc)
        
        $(__auidemo___mac_setfilecmd)
        $(__auidemo___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@auidemo.app/Contents/PkgInfo: auidemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p auidemo.app/Contents

diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index 9e3a1f4d34d9ed1548e3c24b7ce8d640921fd0b7..14be5bae1e347687a5aea4db0e51a7758a5d6885 100644 (file)
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc)
        
        $(__calendar___mac_setfilecmd)
        $(__calendar___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@calendar.app/Contents/PkgInfo: calendar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p calendar.app/Contents

diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index 2e0e537ab2724387f39041bd27cc101ddd93428e..8c1fa4b0dcbb31a1c19614effb5d55d67eb92e96 100644 (file)
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc)
        
        $(__caret___mac_setfilecmd)
        $(__caret___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@caret.app/Contents/PkgInfo: caret$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p caret.app/Contents

diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index 31c02523b0c34327c20b988c22ce511be3bd1d42..ae3f2cc88ec1c851f15629b3fbb189154d94e8bf 100644 (file)
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ clipboard$(EXEEXT): $(CLIPBOARD_OBJECTS) $(__clipboard___win32rc)
        
        $(__clipboard___mac_setfilecmd)
        $(__clipboard___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@clipboard.app/Contents/PkgInfo: clipboard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p clipboard.app/Contents

diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index 6d100bc14c11a967ce1b65c6c54e5e2d2aebdd14..e5b81936e67ea3e64e0beb9a51a25260d6cae3c9 100644 (file)
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ collpane$(EXEEXT): $(COLLPANE_OBJECTS) $(__collpane___win32rc)
        
        $(__collpane___mac_setfilecmd)
        $(__collpane___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@collpane.app/Contents/PkgInfo: collpane$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p collpane.app/Contents

diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index cf01c85d07dc3f5ddfa5a68a3c1ea712199058e8..4aafc0e0af8e0109f45155e53f412471ed4348e9 100644 (file)
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ combo$(EXEEXT): $(COMBO_OBJECTS) $(__combo___win32rc)
        
        $(__combo___mac_setfilecmd)
        $(__combo___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@combo.app/Contents/PkgInfo: combo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p combo.app/Contents

diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index 302310b64389142122f2cdb8fa16a6b13fa049e7..582fcdb1a450c32acbc0e27da9245357b44cb24c 100644 (file)
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc)
        
        $(__conftest___mac_setfilecmd)
        $(__conftest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@conftest.app/Contents/PkgInfo: conftest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p conftest.app/Contents

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 47fd247aa74930a6209ceff091983c6226af329c..35a66f191bb6d100458a9576b461e95af1ef5a08 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -30,7 +30,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -105,7 +104,6 @@ console$(EXEEXT): $(CONSOLE_OBJECTS)
        $(CXX) -o $@ $(CONSOLE_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__console___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 data: 
        @mkdir -p .

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index ff32c7674777a0e6406b48b1d191bed0ec2684a0..47974b25762f7dac90c955b0861faddaa27d02b6 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
        
        $(__controls___mac_setfilecmd)
        $(__controls___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p controls.app/Contents

diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index 4d1e1ff2592660f30196c56ce73c8e07d9e7591b..3ce1ffe08c6e70de4a34fa697dfe2c6772444b4c 100644 (file)
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -157,7 +156,6 @@ dataview$(EXEEXT): $(DATAVIEW_OBJECTS) $(__dataview___win32rc)
        
        $(__dataview___mac_setfilecmd)
        $(__dataview___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@dataview.app/Contents/PkgInfo: dataview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p dataview.app/Contents

diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index 7e9f767e873b80d37cefb0a9e18058e2b92b02e1..70386b463cb53f450ac7b46e52271364b988bb6d 100644 (file)
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -158,7 +157,6 @@ debugrpt$(EXEEXT): $(DEBUGRPT_OBJECTS) $(__debugrpt___win32rc)
        
        $(__debugrpt___mac_setfilecmd)
        $(__debugrpt___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@debugrpt.app/Contents/PkgInfo: debugrpt$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p debugrpt.app/Contents

diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index adbb91de57e7e3bf66d88427ead8566fb337b82a..1c0727ce07299278e0e297d6a194a3b81a3004f9 100644 (file)
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -167,7 +166,6 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc)
        
        $(__dialogs___mac_setfilecmd)
        $(__dialogs___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@dialogs.app/Contents/PkgInfo: dialogs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p dialogs.app/Contents

diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index 07ecf42b183288ee6efe087d3bbba6e88b8bfef2..f5ab5520e22a26f2a14aa9cb09d38924b1a0c55a 100644 (file)
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -153,7 +152,6 @@ distclean: clean
 @COND_PLATFORM_MSDOS_0@        
 @COND_PLATFORM_MSDOS_0@        $(__nettest___mac_setfilecmd)
 @COND_PLATFORM_MSDOS_0@        $(__nettest___os2_emxbindcmd)
-@COND_PLATFORM_MSDOS_0@        $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest.app/Contents/PkgInfo: $(__nettest___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@      mkdir -p nettest.app/Contents

diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index bc756af5494ee618f6d987ce292113967c22b713..2b3d4803ca97e169b8f316ba5ff88f5de391c858 100644 (file)
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc)
        
        $(__display___mac_setfilecmd)
        $(__display___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p display.app/Contents

diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index 4494fc778494bb0b6eb4924c45ca3955b4b93eb7..3f06508a0296035e3848eccad2a0bcde2066f5bc 100644 (file)
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc)
        
        $(__dnd___mac_setfilecmd)
        $(__dnd___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@dnd.app/Contents/PkgInfo: dnd$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p dnd.app/Contents

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index ddd654e007e4812f346af245021dcacfc6328d6c..7f70fcee767bec635de0c1a022ab4be081a0c951 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -153,7 +152,6 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
        
        $(__docview___mac_setfilecmd)
        $(__docview___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/doc.icns $(srcdir)/chart.icns $(srcdir)/notepad.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p docview.app/Contents

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index 3f0b6c747b7192e59b6633a40419cf5b0f7802ff..c3faa822f0ac6e9c10bf1f5d03828a094efa9a2b 100644 (file)
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -157,7 +157,7 @@ bool MyApp::OnInit()
     new wxDocTemplate(docManager, "Drawing", "*.drw", "", "drw",
                       "Drawing Doc", "Drawing View",
                       CLASSINFO(DrawingDocument), CLASSINFO(DrawingView));
-#ifdef __WXMAC__
+#ifdef __WXMAC__ && wxOSX_USE_CARBON
     wxFileName::MacRegisterDefaultTypeAndCreator("drw" , 'WXMB' , 'WXMA');
 #endif
 
@@ -173,7 +173,7 @@ bool MyApp::OnInit()
         new wxDocTemplate(docManager, "Text", "*.txt;*.text", "", "txt;text",
                           "Text Doc", "Text View",
                           CLASSINFO(TextEditDocument), CLASSINFO(TextEditView));
-#ifdef __WXMAC__
+#ifdef __WXMAC__ && wxOSX_USE_CARBON
         wxFileName::MacRegisterDefaultTypeAndCreator("txt" , 'TEXT' , 'WXMA');
 #endif
     }

diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index f12e173648f41c5bb133a0c081b87e5e394e0544..5295d5375e1149b8f6ae2f3f6b7f8b28c668bd92 100644 (file)
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc)
        
        $(__dragimag___mac_setfilecmd)
        $(__dragimag___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@dragimag.app/Contents/PkgInfo: dragimag$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p dragimag.app/Contents

diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index 16b84b5387d1f63fce90529467dd668aae3473f4..ce2d89db20f5f5d896d014f75b651aa0353df6ed 100644 (file)
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc)
        
        $(__drawing___mac_setfilecmd)
        $(__drawing___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@drawing.app/Contents/PkgInfo: drawing$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p drawing.app/Contents

diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index 5c9f59dc3d90c20f5e40627c668c394a8f944350..1de2b660c669ad36ccbf36d78075cad829961932 100644 (file)
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc)
        
        $(__erase___mac_setfilecmd)
        $(__erase___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@erase.app/Contents/PkgInfo: erase$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p erase.app/Contents

diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 55c96fc7445f7e86cf9f59eedfa9be183756c8ee..244f1f67f8d05ec60236928b455b19a4dd45789c 100644 (file)
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc)
        
        $(__event___mac_setfilecmd)
        $(__event___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@event.app/Contents/PkgInfo: event$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p event.app/Contents

diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index e6df51d37e81e54d47b739664bb08991093d77f1..54cf2c66fa9a62229e6ecb5518b59467781c6149 100644 (file)
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ except$(EXEEXT): $(EXCEPT_OBJECTS) $(__except___win32rc)
        
        $(__except___mac_setfilecmd)
        $(__except___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@except.app/Contents/PkgInfo: except$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p except.app/Contents

diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index a1f35c8dcfc7e149855603f351fa15ce009cfa59..89ddc4f52cfd003f2d37989c7e09a6990bd1eb7c 100644 (file)
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc)
        
        $(__exec___mac_setfilecmd)
        $(__exec___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@exec.app/Contents/PkgInfo: exec$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p exec.app/Contents

diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 72a3b864377c54435f1282c22b55897433d97fc8..a326def55295144f3f54c56a5bfd29c43dc95715 100644 (file)
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc)
        
        $(__font___mac_setfilecmd)
        $(__font___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@font.app/Contents/PkgInfo: font$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p font.app/Contents

diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index ec01d81744e4111049833b1ad2f8972069228aff..433a6f07e6917aa01d160e4e3547b4b334f7d70a 100644 (file)
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc)
        
        $(__grid___mac_setfilecmd)
        $(__grid___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@grid.app/Contents/PkgInfo: grid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p grid.app/Contents

diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 9e4060cf7ddd759f1bde367b1274f14f774ab6ee..c71d3de82be397b7fd18680e83a135a3925383ee 100644 (file)
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -36,7 +36,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -160,7 +159,6 @@ help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
        
        $(__help___mac_setfilecmd)
        $(__help___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p help.app/Contents

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 8ecc677c085fc6d4d2d1f4fe989d9b0dead26b99..867b9cd6354c3dc377354587d4fbac965e3da21f 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
        
        $(__htlbox___mac_setfilecmd)
        $(__htlbox___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p htlbox.app/Contents

diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 8a11cd2cdd444b40ddf2ece24ab8089067106e87..5435044ee9aed8bad2adb58ec79cb752533b39c7 100644 (file)
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
        
        $(__about___mac_setfilecmd)
        $(__about___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@about.app/Contents/PkgInfo: about$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p about.app/Contents

diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index cf74ba69538293facdeb4b76862db27c15e29580..b42c06fbaa3acb2b8d5e1b3e28f460bad8ab107b 100644 (file)
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
        
        $(__htmlhelp___mac_setfilecmd)
        $(__htmlhelp___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlhelp.app/Contents

diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 670d0a1c870079e6d365dcebd4b18319cc467149..39d7076affc2a27227c8dd4116e4eaf610bf8e04 100644 (file)
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
        
        $(__helpview___mac_setfilecmd)
        $(__helpview___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents

diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in
index b5dfaaa2c3a4afaacb5fa26942a675ff7286f6f1..09cb571f17d1548b5d6908e886283c37570d0ba9 100644 (file)
--- a/samples/html/htmlctrl/Makefile.in
+++ b/samples/html/htmlctrl/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
        
        $(__htmlctrl___mac_setfilecmd)
        $(__htmlctrl___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@htmlctrl.app/Contents/PkgInfo: htmlctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlctrl.app/Contents

diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index c44d15ea90be13cfc085849d715453346a7d7177..ee69af9e7e9123d81a83d84b6e532642ff28bd1d 100644 (file)
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -161,7 +160,6 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
        
        $(__htmlprinting___mac_setfilecmd)
        $(__htmlprinting___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@htmlprinting.app/Contents/PkgInfo: htmlprinting$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p htmlprinting.app/Contents

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 2dee4424128c56e9387cb675a1f03a340855c9d3..27f23a508222a44300e0a76c84c2f574b303ddcc 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -158,7 +157,6 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
        
        $(__test___mac_setfilecmd)
        $(__test___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents

diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index b81eaa4b44387a330e8d179bc2831ffcb9c729ef..f8fced771460e9a4fe3fe73571f0e1310a1318e7 100644 (file)
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
        
        $(__virtual___mac_setfilecmd)
        $(__virtual___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p virtual.app/Contents

diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index 27543fb142418f001f97eb60c72a311c2db5e4ae..51323e3a514cd8cd84c402092bbcbfbc05188ea3 100644 (file)
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
        
        $(__widget___mac_setfilecmd)
        $(__widget___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@widget.app/Contents/PkgInfo: widget$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p widget.app/Contents

diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index f95a1ef27b6a73bb26da6c7a135498fafbc2efa5..6b3f478fecac83e8d9313a7c6af9e8d89b817d08 100644 (file)
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -155,7 +154,6 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
        
        $(__zip___mac_setfilecmd)
        $(__zip___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@zip.app/Contents/PkgInfo: zip$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p zip.app/Contents

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index b6c3209c685ff062e859da6a60231819492f5480..2117ab74f3213d1666af11bbdea394181052a3c2 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -152,7 +151,6 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
        
        $(__image___mac_setfilecmd)
        $(__image___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p image.app/Contents

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 390d08aea7e36573ef55024dd4b1e1d03a1a369a..7db235cc273d2b0b32fcdf663b5698b0bb041ae8 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
        
        $(__internat___mac_setfilecmd)
        $(__internat___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p internat.app/Contents

diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index 5be6d83b7b59e8d14b3cc6756804446041dbcaa6..f7f638bc8538833d273c9136c059d867235724de 100644 (file)
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -207,7 +206,6 @@ distclean: clean
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__ipcclient___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__ipcclient___os2_emxbindcmd)
-@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient.app/Contents/PkgInfo: $(__ipcclient___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p ipcclient.app/Contents
@@ -236,7 +234,6 @@ distclean: clean
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__ipcserver___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__ipcserver___os2_emxbindcmd)
-@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p ipcserver.app/Contents
@@ -264,13 +261,11 @@ baseipcclient$(EXEEXT): $(BASEIPCCLIENT_OBJECTS)
        $(CXX) -o $@ $(BASEIPCCLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__baseipcclient___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 baseipcserver$(EXEEXT): $(BASEIPCSERVER_OBJECTS)
        $(CXX) -o $@ $(BASEIPCSERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__baseipcserver___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 ipcclient_sample_rc.o: $(srcdir)/../../samples/sample.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0)  $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0)   --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include

diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index fb445732e0d3b47b487a538ca954ecd7d848a964..37c72ccb0def28975c6a7bcb73420393de01d4f5 100644 (file)
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
        
        $(__joytest___mac_setfilecmd)
        $(__joytest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@joytest.app/Contents/PkgInfo: joytest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p joytest.app/Contents

diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 90b2171634d3cbffb1dce03012a7d7f0bd21d714..478f9c387ae39c94b581eed6be51d7a9e38a033e 100644 (file)
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc)
        
        $(__keyboard___mac_setfilecmd)
        $(__keyboard___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@keyboard.app/Contents/PkgInfo: keyboard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p keyboard.app/Contents

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 2e8b5d77f50cb9dcd946eeca9ac9cb46f28480cb..dd8a9931814ad2beb1247be3d3324f591f1fcbe8 100644 (file)
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
        
        $(__layout___mac_setfilecmd)
        $(__layout___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p layout.app/Contents

diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index cd0f3499c8957b71915f35a35222644596e3de2d..f5d970639af1c6693ec984bfaaa84a2c105e4c94 100644 (file)
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc)
        
        $(__listctrl___mac_setfilecmd)
        $(__listctrl___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@listctrl.app/Contents/PkgInfo: listctrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p listctrl.app/Contents

diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 7fc4629d95f328dc322a513344ac4e77678ff412..45833f9cf1d599b1f1e952741683368e09a2d329 100644 (file)
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc)
        
        $(__mdi___mac_setfilecmd)
        $(__mdi___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@mdi.app/Contents/PkgInfo: mdi$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p mdi.app/Contents

diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 9871ba1b80ded1b4968b29d8e27ba5a80570444e..d27ac6d646cb8174fd558ca94438c4454d0134d5 100644 (file)
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -158,7 +157,6 @@ mediaplayer$(EXEEXT): $(MEDIAPLAYER_OBJECTS) $(__mediaplayer___win32rc)
        
        $(__mediaplayer___mac_setfilecmd)
        $(__mediaplayer___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@mediaplayer.app/Contents/PkgInfo: mediaplayer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p mediaplayer.app/Contents

diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in
index da7941daf3f5deefc03c449d1513a3d48c872ff0..93e6f73c1b0f4a250cca17edef18140b2645e8b3 100644 (file)
--- a/samples/memcheck/Makefile.in
+++ b/samples/memcheck/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc)
        
        $(__memcheck___mac_setfilecmd)
        $(__memcheck___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@memcheck.app/Contents/PkgInfo: memcheck$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p memcheck.app/Contents

diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index ff0fa1875040b5ab2a5663aeeb044fd1e2db0fd8..af04ee7ac2934b3325db8efc869823b31990ad07 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc)
        
        $(__menu___mac_setfilecmd)
        $(__menu___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p menu.app/Contents

diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index ca40f01814e76517ba09371b6a81cd5f8dc8cffe..39dc045b168e398584b3dcc2434681d9be09e82e 100644 (file)
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
        
        $(__minimal___mac_setfilecmd)
        $(__minimal___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p minimal.app/Contents

diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 4829fb79fb27ed122f8dec757e804c4a7eefbb95..5bef277448d21ed5b3de90a18f11785cee74fd44 100644 (file)
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc)
        
        $(__nativdlg___mac_setfilecmd)
        $(__nativdlg___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@nativdlg.app/Contents/PkgInfo: nativdlg$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p nativdlg.app/Contents

diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 287cc141ccb4020064c8ca4acdcf426f9cf584b6..3ef2436dd97c8c2f50c41caeb8ee2a10cbfe7660 100644 (file)
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc)
        
        $(__notebook___mac_setfilecmd)
        $(__notebook___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@notebook.app/Contents/PkgInfo: notebook$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p notebook.app/Contents

diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index 7b984e1bcc635105d89bb864aed7707cbec02b24..51001fdcba21a14155f180046835dd56412348b2 100644 (file)
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc)
        
        $(__oleauto___mac_setfilecmd)
        $(__oleauto___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@oleauto.app/Contents/PkgInfo: oleauto$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p oleauto.app/Contents

diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index 7744ba9b0f39e32bf391ab48ed815cb093096006..f0015f98cc0560d8d079aeb7364491fe45141357 100644 (file)
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -153,7 +152,6 @@ distclean: clean
 @COND_USE_OPENGL_1@    
 @COND_USE_OPENGL_1@    $(__cube___mac_setfilecmd)
 @COND_USE_OPENGL_1@    $(__cube___os2_emxbindcmd)
-@COND_USE_OPENGL_1@    $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  mkdir -p cube.app/Contents

diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index 3e362ee0a1bf702e1a7838c016788e6bcd9d6534..c2d38ec9e346f4c80c8acfca619857fc1d8b18b7 100644 (file)
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -154,7 +153,6 @@ distclean: clean
 @COND_USE_OPENGL_1@    
 @COND_USE_OPENGL_1@    $(__isosurf___mac_setfilecmd)
 @COND_USE_OPENGL_1@    $(__isosurf___os2_emxbindcmd)
-@COND_USE_OPENGL_1@    $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@isosurf.app/Contents/PkgInfo: $(__isosurf___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  mkdir -p isosurf.app/Contents

diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index f26346533ec6ca7bd0efaf3647532e4fc48aa464..ea0c71dd52614ad5fdc3d5beb42b62d37b4e6d92 100644 (file)
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -37,7 +37,6 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -164,7 +163,6 @@ distclean: clean
 @COND_USE_OPENGL_1@    
 @COND_USE_OPENGL_1@    $(__penguin___mac_setfilecmd)
 @COND_USE_OPENGL_1@    $(__penguin___os2_emxbindcmd)
-@COND_USE_OPENGL_1@    $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@penguin.app/Contents/PkgInfo: $(__penguin___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_OPENGL_1@  mkdir -p penguin.app/Contents

diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index a8d42f1ff21a61b96f85d1483b59cc3afd74480c..b38115f1c36d82f11d38ffdf4ef0d08e307dee6e 100644 (file)
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc)
        
        $(__ownerdrw___mac_setfilecmd)
        $(__ownerdrw___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@ownerdrw.app/Contents/PkgInfo: ownerdrw$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p ownerdrw.app/Contents

diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index e1ae2dd015a8c87f899874374cce35b820f41348..14f800de6d93bc3d050df51aa5c9a2ddcb0cf3cb 100644 (file)
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
        
        $(__popup___mac_setfilecmd)
        $(__popup___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p popup.app/Contents

diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index bed63bed3559989a7a02c206b69536ca19111e8d..0eb0d8d176e8efdc006556b33dc39a96ba216354 100644 (file)
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ power$(EXEEXT): $(POWER_OBJECTS) $(__power___win32rc)
        
        $(__power___mac_setfilecmd)
        $(__power___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@power.app/Contents/PkgInfo: power$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p power.app/Contents

diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index 455b0ba3111c68c868dfdef779284888f34a1efc..f87eae5f93b9a002c35f8f310b397112c23d1358 100644 (file)
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc)
        
        $(__printing___mac_setfilecmd)
        $(__printing___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@printing.app/Contents/PkgInfo: printing$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p printing.app/Contents

diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index 12cdd2da531b7f3ced2c527b7aaa26e102d5e572..5f88519a187b3f0bec8cd82ddc577412340072be 100644 (file)
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -162,7 +161,6 @@ propgrid$(EXEEXT): $(PROPGRID_OBJECTS) $(__propgrid___win32rc)
        
        $(__propgrid___mac_setfilecmd)
        $(__propgrid___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@propgrid.app/Contents/PkgInfo: propgrid$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p propgrid.app/Contents

diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 5b879cf30d02bf8eb8dc15d2dfd768cd806abe51..693188bd8cc01a85c58e6649e5a69b439dfc00b1 100644 (file)
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc)
        
        $(__regtest___mac_setfilecmd)
        $(__regtest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@regtest.app/Contents/PkgInfo: regtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p regtest.app/Contents

diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index f75b3943af0fddcce6c3705363b0c27ea2996c86..1782363e1bed15c979cdb05f701e070a8615c6bb 100644 (file)
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -42,7 +42,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -183,7 +182,6 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
        
        $(__render___mac_setfilecmd)
        $(__render___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@render.app/Contents/PkgInfo: render$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p render.app/Contents

diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index 6e2de9dc90d6b6947fd1d3fe10eeed3b83b80af9..aa9301c77ecfeab59a1c6d8e2731c56f5a661550 100644 (file)
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -37,7 +37,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -167,7 +166,6 @@ richtext$(EXEEXT): $(RICHTEXT_OBJECTS) $(__richtext___win32rc)
        
        $(__richtext___mac_setfilecmd)
        $(__richtext___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@richtext.app/Contents/PkgInfo: richtext$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p richtext.app/Contents

diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index a009cf7fc96ac68edbe35e38fd1af5bb52ee7183..d04ee2534993ba2506ec792fb6e60bb190271dd2 100644 (file)
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc)
        
        $(__sashtest___mac_setfilecmd)
        $(__sashtest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@sashtest.app/Contents/PkgInfo: sashtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p sashtest.app/Contents

diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 11bf94267fc7e392f4cdae1522f54a5219f186bf..266f0467671000e02e8c484ebc13e43fa64d4306 100644 (file)
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc)
        
        $(__scroll___mac_setfilecmd)
        $(__scroll___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@scroll.app/Contents/PkgInfo: scroll$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p scroll.app/Contents

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index 7c94906b62a0f462a60819bd113d79c846082feb..f9adc6f43f7b6f6cee2f0c82f468cf9a49538aef 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -1314,7 +1314,7 @@ void MyAutoScrollingWindow::OnMouseMove(wxMouseEvent& event)
         // set the new cursor position
         m_cursor = DeviceCoordsToGraphicalChars(event.GetPosition());
         // draw/erase selection
-        MyRefresh();
+        // MyRefresh();
         // capture mouse to activate auto-scrolling
         if (!HasCapture()) {
             CaptureMouse();

diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index 84bedd3852e0003e0ad625d1aac0ce068ffa7b17..adc8aaf7f8cd337bfa7d1672f69da0a8cdeb346a 100644 (file)
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc)
        
        $(__shaped___mac_setfilecmd)
        $(__shaped___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@shaped.app/Contents/PkgInfo: shaped$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p shaped.app/Contents

diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index a51c55bfe4a1d622d60a7563372223d120205058..c3daa0ed69ba91d9b51411cd14a32d2435a5ca5e 100644 (file)
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -205,7 +204,6 @@ distclean: clean
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__client___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__client___os2_emxbindcmd)
-@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@client.app/Contents/PkgInfo: $(__client___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p client.app/Contents
@@ -234,7 +232,6 @@ distclean: clean
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__server___mac_setfilecmd)
 @COND_USE_GUI_1@       $(__server___os2_emxbindcmd)
-@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p server.app/Contents
@@ -262,13 +259,11 @@ baseclient$(EXEEXT): $(BASECLIENT_OBJECTS)
        $(CXX) -o $@ $(BASECLIENT_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__baseclient___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 baseserver$(EXEEXT): $(BASESERVER_OBJECTS)
        $(CXX) -o $@ $(BASESERVER_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__baseserver___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 client_client.o: $(srcdir)/client.cpp
        $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $(srcdir)/client.cpp

diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 4cd02243455f34e0a0896d8cf0db52fca2c9d928..924ac223b6a89739b934190811f322e1d46127b1 100644 (file)
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ sound$(EXEEXT): $(SOUND_OBJECTS) $(__sound___win32rc)
        
        $(__sound___mac_setfilecmd)
        $(__sound___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p sound.app/Contents

diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index 5cb5380bd192f9025094ecd0bc9924c9ce3b634e..4d22e06a67df0eb8924803e5f0fc04446096e87e 100644 (file)
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -36,7 +36,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -160,7 +159,6 @@ splash$(EXEEXT): $(SPLASH_OBJECTS) $(__splash___win32rc)
        
        $(__splash___mac_setfilecmd)
        $(__splash___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@splash.app/Contents/PkgInfo: splash$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p splash.app/Contents

diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 4957933f450ad547a246d733aabd13ebdb9f2f76..263355222012a620522e6a21efb587edb5aa2007 100644 (file)
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc)
        
        $(__splitter___mac_setfilecmd)
        $(__splitter___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@splitter.app/Contents/PkgInfo: splitter$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p splitter.app/Contents

diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index 680aac5e6ae6b27feb092ec404a9df8f59fa8725..7158f1bac46666f8b28e3a46b71b954d83d076b5 100644 (file)
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc)
        
        $(__statbar___mac_setfilecmd)
        $(__statbar___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@statbar.app/Contents/PkgInfo: statbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p statbar.app/Contents

diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index 12cafd07529076b4259e714d52ca3e1a97a09bc2..a7a7b8637a4f608d8cdc7fd3886079fbd2f394cb 100644 (file)
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
        
        $(__stctest___mac_setfilecmd)
        $(__stctest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p stctest.app/Contents

diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 0a57e4be37ec11b50540f1449dd4320b46267c07..0b1d68bc2584da6efea3cbbeb73646227cf1b5d5 100644 (file)
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
        
        $(__svgtest___mac_setfilecmd)
        $(__svgtest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p svgtest.app/Contents

diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in
index 0e656fe84c00bfd3ed6c9abac787a9356aa781e5..1ea10cfd4c625cee05549daa51d3a89a0f1a350c 100644 (file)
--- a/samples/taborder/Makefile.in
+++ b/samples/taborder/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ taborder$(EXEEXT): $(TABORDER_OBJECTS) $(__taborder___win32rc)
        
        $(__taborder___mac_setfilecmd)
        $(__taborder___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@taborder.app/Contents/PkgInfo: taborder$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p taborder.app/Contents

diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index e963ffc7fd445292bb6c06764aa2c1fdb8d950e5..1fe446501fef3c865c77ae03bf1425c0fdd1c222 100644 (file)
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc)
        
        $(__taskbar___mac_setfilecmd)
        $(__taskbar___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p taskbar.app/Contents

diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index 23ce7d565ce68301c7b445f861a94ec70e6cf043..8761ef6da379e7af5a13d2280a8d8ecc00444d5a 100644 (file)
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc)
        
        $(__text___mac_setfilecmd)
        $(__text___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@text.app/Contents/PkgInfo: text$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p text.app/Contents

diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index d283399b387c82b2b6c9190ec25288981779bda2..570166903b03ed4f3bef7b954a7e2ad8d41c4a6d 100644 (file)
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc)
        
        $(__thread___mac_setfilecmd)
        $(__thread___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@thread.app/Contents/PkgInfo: thread$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p thread.app/Contents

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 59b4bd786b99a84c762d1348599f0c9aa66aebfd..7062f256a354f9c59483805072b29c04cf4e9f77 100644 (file)
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
        
        $(__toolbar___mac_setfilecmd)
        $(__toolbar___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p toolbar.app/Contents

diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index a9e6f96e15a2d52b25b50ea46238007cdf7a84e0..745f27eb38818b7efe20e964c2cfcaf54565fa06 100644 (file)
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc)
        
        $(__treectrl___mac_setfilecmd)
        $(__treectrl___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@treectrl.app/Contents/PkgInfo: treectrl$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p treectrl.app/Contents

diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index 7e797f1ae67df6293c8cfc4a0bc7ca9fbf44e5b1..9f8b672eede8899dedda0f2d9298dab104710176 100644 (file)
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc)
        
        $(__typetest___mac_setfilecmd)
        $(__typetest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@typetest.app/Contents/PkgInfo: typetest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p typetest.app/Contents

diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index 0297830532c797dbba4c7df2d95161968d037628..e56b86f5a9407bc122e193c7af386b0f8c40e33b 100644 (file)
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc)
        
        $(__validate___mac_setfilecmd)
        $(__validate___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@validate.app/Contents/PkgInfo: validate$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p validate.app/Contents

diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index da4f5bc25f1226e92b92347fc63f525434fcac52..b344387cc841ea2bd602acf9275e73f620bed7f9 100644 (file)
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc)
        
        $(__vstest___mac_setfilecmd)
        $(__vstest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@vstest.app/Contents/PkgInfo: vstest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p vstest.app/Contents

diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index 71b3ac120895122b709cd5b7fbc46b9e00dd4b54..a4114b93dae52baf97d3f23828eb6fef01020dd8 100644 (file)
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -183,7 +182,6 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc)
        
        $(__widgets___mac_setfilecmd)
        $(__widgets___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@widgets.app/Contents/PkgInfo: widgets$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p widgets.app/Contents

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 876fe7047ea8f20b30e54d253f4b4806e3636022..97153f68507632d80d1ac01212f0c5cbdc3b11bd 100644 (file)
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -35,7 +35,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -156,7 +155,6 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
        
        $(__wizard___mac_setfilecmd)
        $(__wizard___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p wizard.app/Contents

diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index 555779f134397d819f34204e3f008569bfa99f06..93f415138d49db2824fb0ff8f4502e10426b9f88 100644 (file)
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -34,7 +34,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -151,7 +150,6 @@ wrapsizer$(EXEEXT): $(WRAPSIZER_OBJECTS) $(__wrapsizer___win32rc)
        
        $(__wrapsizer___mac_setfilecmd)
        $(__wrapsizer___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@wrapsizer.app/Contents/PkgInfo: wrapsizer$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p wrapsizer.app/Contents

diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 55bf94bdb761e3cb8d256adb90daa2f8cb3a6693..ceff2a67ed504750d30198d4bb4371c6bc9095f0 100644 (file)
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -37,7 +37,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -170,7 +169,6 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
        
        $(__xrcdemo___mac_setfilecmd)
        $(__xrcdemo___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p xrcdemo.app/Contents

diff --git a/tests/Makefile.in b/tests/Makefile.in
index fd86358c89fe571b28765d287f8360c3fdd7ef18..179cdfb230ec46f8651b4d5bd06b2f1884efae65 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -39,7 +39,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -289,7 +288,6 @@ test$(EXEEXT): $(TEST_OBJECTS)
        $(CXX) -o $@ $(TEST_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__test___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_USE_PCH_1@./.pch/testprec_test/testprec.h.gch: 
 @COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS)
@@ -298,7 +296,6 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_USE_GUI_1@       $(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS)  $(LDFLAGS)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_USE_GUI_1@       
 @COND_USE_GUI_1@       $(__test_gui___mac_setfilecmd)
-@COND_USE_GUI_1@       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@     mkdir -p test_gui.app/Contents
@@ -353,7 +350,6 @@ printfbench$(EXEEXT): $(PRINTFBENCH_OBJECTS)
        $(CXX) -o $@ $(PRINTFBENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__printfbench___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_USE_PCH_1@./.pch/testprec_printfbench/testprec.h.gch: 
 @COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/testprec_printfbench/testprec.h.gch testprec.h $(CXX) $(PRINTFBENCH_CXXFLAGS)

diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index d4a259e703cc53bc5cca19cf24b64bbecb1b173d..687daefe1f6474501132efb649f94f2f4608292a 100644 (file)
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -30,7 +30,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -111,7 +110,6 @@ bench$(EXEEXT): $(BENCH_OBJECTS)
        $(CXX) -o $@ $(BENCH_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(__WXLIB_BASE_p)  $(__WXLIB_NET_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
        
        $(__bench___mac_setfilecmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 data: 
        @mkdir -p .

diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in
index 98912b8230a8bc5a971e87c7f4c4073b4e35ee5e..bcda53a7098a5035bda493e9d56ad997b095175c 100644 (file)
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -39,7 +39,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
@@ -163,7 +162,6 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
        
        $(__helpview___mac_setfilecmd)
        $(__helpview___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@helpview.app/Contents/PkgInfo: helpview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p helpview.app/Contents
@@ -180,7 +178,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >helpview.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
+@COND_PLATFORM_MACOSX_1@       mv helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns helpview.app/Contents/Resources/wxmac.icns

diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in
index 1edd4105914b806890dfb226ff495caf7322f3e8..f507c771a4c35ce98d6d51b9b3959f091b574ff1 100644 (file)
--- a/utils/screenshotgen/src/Makefile.in
+++ b/utils/screenshotgen/src/Makefile.in
@@ -41,7 +41,6 @@ EXTRALIBS_SDL = @EXTRALIBS_SDL@
 CXXWARNINGS = @CXXWARNINGS@
 HOST_SUFFIX = @HOST_SUFFIX@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
-SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 HEADER_PAD_OPTION = @HEADER_PAD_OPTION@
 wx_top_builddir = @wx_top_builddir@
 
@@ -186,7 +185,6 @@ screenshotgen$(EXEEXT): $(SCREENSHOTGEN_OBJECTS) $(__screenshotgen___win32rc)
        
        $(__screenshotgen___mac_setfilecmd)
        $(__screenshotgen___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
 
 @COND_PLATFORM_MACOSX_1@screenshotgen.app/Contents/PkgInfo: screenshotgen$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p screenshotgen.app/Contents
@@ -203,7 +201,7 @@ screenshotgen$(EXEEXT): $(SCREENSHOTGEN_OBJECTS) $(__screenshotgen___win32rc)
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >screenshotgen.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       ln -f screenshotgen$(EXEEXT) screenshotgen.app/Contents/MacOS/screenshotgen
+@COND_PLATFORM_MACOSX_1@       mv screenshotgen$(EXEEXT) screenshotgen.app/Contents/MacOS/screenshotgen
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns screenshotgen.app/Contents/Resources/wxmac.icns