From 2fd716136a961ab6038996343e42257c2d81aac2 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 15 Mar 2009 16:14:56 +0000 Subject: [PATCH 1/1] Rebake after last change. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 18 ++++++++++++++++ configure | 32 +++++++++++++++++------------ demos/bombs/Makefile.in | 2 -- demos/forty/Makefile.in | 2 -- demos/fractal/Makefile.in | 2 -- demos/life/Makefile.in | 2 -- demos/poem/Makefile.in | 2 -- samples/access/Makefile.in | 2 -- samples/animate/Makefile.in | 2 -- samples/artprov/Makefile.in | 2 -- samples/aui/Makefile.in | 2 -- samples/calendar/Makefile.in | 2 -- samples/caret/Makefile.in | 2 -- samples/clipboard/Makefile.in | 2 -- samples/collpane/Makefile.in | 2 -- samples/combo/Makefile.in | 2 -- samples/config/Makefile.in | 2 -- samples/console/Makefile.in | 2 -- samples/controls/Makefile.in | 2 -- samples/dataview/Makefile.in | 2 -- samples/debugrpt/Makefile.in | 2 -- samples/dialogs/Makefile.in | 2 -- samples/dialup/Makefile.in | 2 -- samples/display/Makefile.in | 2 -- samples/dnd/Makefile.in | 2 -- samples/docview/Makefile.in | 2 -- samples/docview/docview.cpp | 4 ++-- samples/dragimag/Makefile.in | 2 -- samples/drawing/Makefile.in | 2 -- samples/erase/Makefile.in | 2 -- samples/event/Makefile.in | 2 -- samples/except/Makefile.in | 2 -- samples/exec/Makefile.in | 2 -- samples/font/Makefile.in | 2 -- samples/grid/Makefile.in | 2 -- samples/help/Makefile.in | 2 -- samples/htlbox/Makefile.in | 2 -- samples/html/about/Makefile.in | 2 -- samples/html/help/Makefile.in | 2 -- samples/html/helpview/Makefile.in | 2 -- samples/html/htmlctrl/Makefile.in | 2 -- samples/html/printing/Makefile.in | 2 -- samples/html/test/Makefile.in | 2 -- samples/html/virtual/Makefile.in | 2 -- samples/html/widget/Makefile.in | 2 -- samples/html/zip/Makefile.in | 2 -- samples/image/Makefile.in | 2 -- samples/internat/Makefile.in | 2 -- samples/ipc/Makefile.in | 5 ----- samples/joytest/Makefile.in | 2 -- samples/keyboard/Makefile.in | 2 -- samples/layout/Makefile.in | 2 -- samples/listctrl/Makefile.in | 2 -- samples/mdi/Makefile.in | 2 -- samples/mediaplayer/Makefile.in | 2 -- samples/memcheck/Makefile.in | 2 -- samples/menu/Makefile.in | 2 -- samples/minimal/Makefile.in | 2 -- samples/nativdlg/Makefile.in | 2 -- samples/notebook/Makefile.in | 2 -- samples/oleauto/Makefile.in | 2 -- samples/opengl/cube/Makefile.in | 2 -- samples/opengl/isosurf/Makefile.in | 2 -- samples/opengl/penguin/Makefile.in | 2 -- samples/ownerdrw/Makefile.in | 2 -- samples/popup/Makefile.in | 2 -- samples/power/Makefile.in | 2 -- samples/printing/Makefile.in | 2 -- samples/propgrid/Makefile.in | 2 -- samples/regtest/Makefile.in | 2 -- samples/render/Makefile.in | 2 -- samples/richtext/Makefile.in | 2 -- samples/sashtest/Makefile.in | 2 -- samples/scroll/Makefile.in | 2 -- samples/scroll/scroll.cpp | 2 +- samples/shaped/Makefile.in | 2 -- samples/sockets/Makefile.in | 5 ----- samples/sound/Makefile.in | 2 -- samples/splash/Makefile.in | 2 -- samples/splitter/Makefile.in | 2 -- samples/statbar/Makefile.in | 2 -- samples/stc/Makefile.in | 2 -- samples/svg/Makefile.in | 2 -- samples/taborder/Makefile.in | 2 -- samples/taskbar/Makefile.in | 2 -- samples/text/Makefile.in | 2 -- samples/thread/Makefile.in | 2 -- samples/toolbar/Makefile.in | 2 -- samples/treectrl/Makefile.in | 2 -- samples/typetest/Makefile.in | 2 -- samples/validate/Makefile.in | 2 -- samples/vscroll/Makefile.in | 2 -- samples/widgets/Makefile.in | 2 -- samples/wizard/Makefile.in | 2 -- samples/wrapsizer/Makefile.in | 2 -- samples/xrc/Makefile.in | 2 -- tests/Makefile.in | 4 ---- tests/benchmarks/Makefile.in | 2 -- utils/helpview/src/Makefile.in | 4 +--- utils/screenshotgen/src/Makefile.in | 4 +--- 100 files changed, 42 insertions(+), 218 deletions(-) diff --git a/Makefile.in b/Makefile.in index 280a2cb067..b0a06b0cd6 100644 --- 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 a03a8a96da..e8015b9cda 100755 --- 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 <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 5bfc3b0494..369959a47e 100644 --- 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 575229cd52..a35836db6a 100644 --- 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 8f815b6c93..24eac54076 100644 --- 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 4cda96c39f..10411b3893 100644 --- 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 79c4f01b19..765255e9c5 100644 --- 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 9565a53a1c..efaf598e6d 100644 --- 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 dc370cf545..7a26d582d2 100644 --- 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 1711786310..9960b22f9b 100644 --- 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 40824ce354..05f2cc4b72 100644 --- 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 9e3a1f4d34..14be5bae1e 100644 --- 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 2e0e537ab2..8c1fa4b0dc 100644 --- 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 31c02523b0..ae3f2cc88e 100644 --- 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 6d100bc14c..e5b81936e6 100644 --- 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 cf01c85d07..4aafc0e0af 100644 --- 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 302310b643..582fcdb1a4 100644 --- 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 47fd247aa7..35a66f191b 100644 --- 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 ff32c76747..47974b2576 100644 --- 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 4d1e1ff259..3ce1ffe08c 100644 --- 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 7e9f767e87..70386b463c 100644 --- 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 adbb91de57..1c0727ce07 100644 --- 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 07ecf42b18..f5ab5520e2 100644 --- 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 bc756af549..2b3d4803ca 100644 --- 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 4494fc7784..3f06508a02 100644 --- 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 ddd654e007..7f70fcee76 100644 --- 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 3f0b6c747b..c3faa822f0 100644 --- 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 f12e173648..5295d5375e 100644 --- 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 16b84b5387..ce2d89db20 100644 --- 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 5c9f59dc3d..1de2b660c6 100644 --- 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 55c96fc744..244f1f67f8 100644 --- 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 e6df51d37e..54cf2c66fa 100644 --- 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 a1f35c8dcf..89ddc4f52c 100644 --- 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 72a3b86437..a326def552 100644 --- 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 ec01d81744..433a6f07e6 100644 --- 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 9e4060cf7d..c71d3de82b 100644 --- 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 8ecc677c08..867b9cd635 100644 --- 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 8a11cd2cdd..5435044ee9 100644 --- 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 cf74ba6953..b42c06fbaa 100644 --- 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 670d0a1c87..39d7076aff 100644 --- 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 b5dfaaa2c3..09cb571f17 100644 --- 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 c44d15ea90..ee69af9e7e 100644 --- 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 2dee442412..27f23a5082 100644 --- 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 b81eaa4b44..f8fced7714 100644 --- 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 27543fb142..51323e3a51 100644 --- 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 f95a1ef27b..6b3f478fec 100644 --- 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 b6c3209c68..2117ab74f3 100644 --- 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 390d08aea7..7db235cc27 100644 --- 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 5be6d83b7b..f7f638bc85 100644 --- 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 fb445732e0..37c72ccb0d 100644 --- 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 90b2171634..478f9c387a 100644 --- 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 2e8b5d77f5..dd8a993181 100644 --- 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 cd0f3499c8..f5d970639a 100644 --- 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 7fc4629d95..45833f9cf1 100644 --- 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 9871ba1b80..d27ac6d646 100644 --- 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 da7941daf3..93e6f73c1b 100644 --- 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 ff0fa18750..af04ee7ac2 100644 --- 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 ca40f01814..39dc045b16 100644 --- 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 4829fb79fb..5bef277448 100644 --- 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 287cc141cc..3ef2436dd9 100644 --- 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 7b984e1bcc..51001fdcba 100644 --- 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 7744ba9b0f..f0015f98cc 100644 --- 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 3e362ee0a1..c2d38ec9e3 100644 --- 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 f26346533e..ea0c71dd52 100644 --- 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 a8d42f1ff2..b38115f1c3 100644 --- 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 e1ae2dd015..14f800de6d 100644 --- 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 bed63bed35..0eb0d8d176 100644 --- 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 455b0ba311..f87eae5f93 100644 --- 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 12cdd2da53..5f88519a18 100644 --- 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 5b879cf30d..693188bd8c 100644 --- 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 f75b3943af..1782363e1b 100644 --- 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 6e2de9dc90..aa9301c77e 100644 --- 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 a009cf7fc9..d04ee25349 100644 --- 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 11bf94267f..266f046767 100644 --- 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 7c94906b62..f9adc6f43f 100644 --- 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 84bedd3852..adc8aaf7f8 100644 --- 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 a51c55bfe4..c3daa0ed69 100644 --- 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 4cd0224345..924ac223b6 100644 --- 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 5cb5380bd1..4d22e06a67 100644 --- 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 4957933f45..2633552220 100644 --- 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 680aac5e6a..7158f1bac4 100644 --- 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 12cafd0752..a7a7b8637a 100644 --- 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 0a57e4be37..0b1d68bc25 100644 --- 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 0e656fe84c..1ea10cfd4c 100644 --- 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 e963ffc7fd..1fe446501f 100644 --- 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 23ce7d565c..8761ef6da3 100644 --- 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 d283399b38..570166903b 100644 --- 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 59b4bd786b..7062f256a3 100644 --- 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 a9e6f96e15..745f27eb38 100644 --- 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 7e797f1ae6..9f8b672eed 100644 --- 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 0297830532..e56b86f5a9 100644 --- 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 da4f5bc25f..b344387cc8 100644 --- 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 71b3ac1208..a4114b93da 100644 --- 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 876fe7047e..97153f6850 100644 --- 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 555779f134..93f415138d 100644 --- 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 55bf94bdb7..ceff2a67ed 100644 --- 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 fd86358c89..179cdfb230 100644 --- 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 d4a259e703..687daefe1f 100644 --- 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 98912b8230..bcda53a709 100644 --- 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 1edd410591..f507c771a4 100644 --- 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 -- 2.45.2