From ab892b9519be1eb18beb27928c767203809dce12 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 13 Aug 2003 12:38:44 +0000 Subject: [PATCH] makefiles update with OSX fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/animate/Makefile.in | 46 +++- .../samples/deprecated/proplist/Makefile.in | 46 +++- .../samples/deprecated/resource/Makefile.in | 46 +++- .../samples/deprecated/treelay/Makefile.in | 46 +++- contrib/samples/fl/Makefile.in | 204 ++++++++++++++---- contrib/samples/gizmos/dynsash/Makefile.in | 46 +++- .../samples/gizmos/dynsash_switch/Makefile.in | 47 +++- contrib/samples/gizmos/editlbox/Makefile.in | 46 +++- contrib/samples/gizmos/led/Makefile.in | 46 +++- contrib/samples/gizmos/multicell/Makefile.in | 46 +++- contrib/samples/gizmos/splittree/Makefile.in | 46 +++- contrib/samples/mmedia/Makefile.in | 46 +++- contrib/samples/ogl/ogledit/Makefile.in | 46 +++- contrib/samples/ogl/studio/Makefile.in | 46 +++- contrib/samples/plot/Makefile.in | 47 +++- contrib/samples/stc/Makefile.in | 46 +++- contrib/samples/svg/Makefile.in | 46 +++- contrib/samples/xrc/Makefile.in | 46 +++- contrib/utils/wxrc/Makefile.in | 5 +- demos/bombs/Makefile.in | 44 +++- demos/dbbrowse/Makefile.in | 44 +++- demos/forty/Makefile.in | 44 +++- demos/fractal/Makefile.in | 44 +++- demos/life/Makefile.in | 44 +++- demos/poem/Makefile.in | 44 +++- samples/access/Makefile.in | 44 +++- samples/artprov/Makefile.in | 44 +++- samples/calendar/Makefile.in | 44 +++- samples/caret/Makefile.in | 44 +++- samples/checklst/Makefile.in | 44 +++- samples/config/Makefile.in | 44 +++- samples/console/Makefile.in | 8 +- samples/controls/Makefile.in | 44 +++- samples/db/Makefile.in | 44 +++- samples/dialogs/Makefile.in | 44 +++- samples/dialup/Makefile.in | 44 +++- samples/display/Makefile.in | 44 +++- samples/dnd/Makefile.in | 44 +++- samples/docview/Makefile.in | 47 +++- samples/docvwmdi/Makefile.in | 44 +++- samples/dragimag/Makefile.in | 44 +++- samples/drawing/Makefile.in | 44 +++- samples/dynamic/Makefile.in | 44 +++- samples/erase/Makefile.in | 44 +++- samples/event/Makefile.in | 44 +++- samples/exec/Makefile.in | 44 +++- samples/font/Makefile.in | 44 +++- samples/grid/Makefile.in | 44 +++- samples/help/Makefile.in | 44 +++- samples/htlbox/Makefile.in | 44 +++- samples/html/Makefile.in | 21 +- samples/html/about/Makefile.in | 44 +++- samples/html/help/Makefile.in | 44 +++- samples/html/helpview/Makefile.in | 44 +++- samples/html/printing/Makefile.in | 44 +++- samples/html/test/Makefile.in | 44 +++- samples/html/virtual/Makefile.in | 44 +++- samples/html/widget/Makefile.in | 44 +++- samples/html/zip/Makefile.in | 44 +++- samples/image/Makefile.in | 44 +++- samples/internat/Makefile.in | 44 +++- samples/ipc/Makefile.in | 78 +++++-- samples/joytest/Makefile.in | 44 +++- samples/keyboard/Makefile.in | 44 +++- samples/layout/Makefile.in | 44 +++- samples/listbox/Makefile.in | 44 +++- samples/listctrl/Makefile.in | 44 +++- samples/mdi/Makefile.in | 44 +++- samples/memcheck/Makefile.in | 44 +++- samples/menu/Makefile.in | 44 +++- samples/mfc/Makefile.in | 44 +++- samples/minifram/Makefile.in | 44 +++- samples/mobile/Makefile.in | 9 +- samples/mobile/styles/Makefile.in | 44 +++- samples/mobile/wxedit/Makefile.in | 44 +++- samples/multimon/Makefile.in | 45 +++- samples/nativdlg/Makefile.in | 44 +++- samples/notebook/Makefile.in | 44 +++- samples/oleauto/Makefile.in | 44 +++- samples/opengl/Makefile.in | 11 +- samples/opengl/cube/Makefile.in | 44 +++- samples/opengl/isosurf/Makefile.in | 44 +++- samples/opengl/penguin/Makefile.in | 46 +++- samples/ownerdrw/Makefile.in | 44 +++- samples/png/Makefile.in | 44 +++- samples/printing/Makefile.in | 44 +++- samples/propsize/Makefile.in | 44 +++- samples/regtest/Makefile.in | 44 +++- samples/render/Makefile.in | 44 +++- samples/richedit/Makefile.in | 44 +++- samples/rotate/Makefile.in | 44 +++- samples/sashtest/Makefile.in | 44 +++- samples/scroll/Makefile.in | 44 +++- samples/scrollsub/Makefile.in | 44 +++- samples/shaped/Makefile.in | 44 +++- samples/sockets/Makefile.in | 78 +++++-- samples/splitter/Makefile.in | 44 +++- samples/statbar/Makefile.in | 44 +++- samples/stc/Makefile.in | 46 +++- samples/svg/Makefile.in | 46 +++- samples/tab/Makefile.in | 44 +++- samples/taskbar/Makefile.in | 44 +++- samples/text/Makefile.in | 44 +++- samples/thread/Makefile.in | 44 +++- samples/toolbar/Makefile.in | 44 +++- samples/treectrl/Makefile.in | 44 +++- samples/typetest/Makefile.in | 44 +++- samples/validate/Makefile.in | 44 +++- samples/vscroll/Makefile.in | 44 +++- samples/widgets/Makefile.in | 44 +++- samples/wizard/Makefile.in | 44 +++- samples/wxtest/Makefile.in | 44 +++- samples/xrc/Makefile.in | 46 +++- utils/wxrc/Makefile.in | 5 +- 114 files changed, 4010 insertions(+), 1077 deletions(-) diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in index b0069ac402..fc988c922f 100644 --- a/contrib/samples/animate/Makefile.in +++ b/contrib/samples/animate/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,8 +36,8 @@ top_srcdir = @top_srcdir@ ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) ANITEST_OBJECTS = \ anitest_anitest.o \ $(__anitest___win32rc) @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ anitest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,26 +125,52 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C anitest$(EXEEXT) @COND_PLATFORM_WIN32_1@__anitest___win32rc = anitest_anitest_rc.o +@COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle ### Targets: ### -all: anitest$(EXEEXT) data +all: anitest$(EXEEXT) $(__anitest_bundle___depname) data anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc) $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__anitest___mac_rezcmd) $(__anitest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +anitest.app/Contents: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p anitest.app/Contents + mkdir -p anitest.app/Contents/MacOS + mkdir -p anitest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/anitest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >anitest.app/Contents/Info.plist + + + echo -n "APPL????" >anitest.app/Contents/PkgInfo + + + ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc anitest.app/Contents/Resources/anitest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns anitest.app/Contents/Resources/wxmac.icns anitest_anitest.o: $(srcdir)/anitest.cpp $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $< anitest_anitest_rc.o: $(srcdir)/anitest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include + +@COND_PLATFORM_MACOSX_1@anitest_bundle: anitest.app/Contents clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f anitest$(EXEEXT) + rm -rf anitest.app data: @mkdir -p . @@ -154,8 +181,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -167,4 +193,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all anitest_bundle clean data distclean install uninstall diff --git a/contrib/samples/deprecated/proplist/Makefile.in b/contrib/samples/deprecated/proplist/Makefile.in index 881a14e3c6..1fe999119d 100644 --- a/contrib/samples/deprecated/proplist/Makefile.in +++ b/contrib/samples/deprecated/proplist/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib PROPLIST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) PROPLIST_OBJECTS = \ proplist_proplist.o \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - proplist$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o proplist$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__proplist___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C proplist$(EXEEXT) @COND_PLATFORM_WIN32_1@__proplist___win32rc = proplist_proplist_rc.o +@COND_PLATFORM_MACOSX_1@__proplist_bundle___depname = proplist_bundle ### Targets: ### -all: proplist$(EXEEXT) +all: proplist$(EXEEXT) $(__proplist_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f proplist$(EXEEXT) + rm -rf proplist.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,12 +148,36 @@ proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc) $(CXX) -o $@ $(PROPLIST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__proplist___mac_rezcmd) $(__proplist___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +proplist.app/Contents: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p proplist.app/Contents + mkdir -p proplist.app/Contents/MacOS + mkdir -p proplist.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/proplist/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >proplist.app/Contents/Info.plist + + + echo -n "APPL????" >proplist.app/Contents/PkgInfo + + + ln -f proplist$(EXEEXT) proplist.app/Contents/MacOS/proplist + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc proplist.app/Contents/Resources/proplist.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns proplist.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@proplist_bundle: proplist.app/Contents proplist_proplist.o: $(srcdir)/proplist.cpp $(CXXC) -c -o $@ $(PROPLIST_CXXFLAGS) $< proplist_proplist_rc.o: $(srcdir)/proplist.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include uninstall: @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install proplist_bundle uninstall diff --git a/contrib/samples/deprecated/resource/Makefile.in b/contrib/samples/deprecated/resource/Makefile.in index 856c0ff799..dd616b6461 100644 --- a/contrib/samples/deprecated/resource/Makefile.in +++ b/contrib/samples/deprecated/resource/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib RESOURCE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) RESOURCE_OBJECTS = \ resource_resource.o \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - resource$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o resource$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__resource___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C resource$(EXEEXT) @COND_PLATFORM_WIN32_1@__resource___win32rc = resource_resource_rc.o +@COND_PLATFORM_MACOSX_1@__resource_bundle___depname = resource_bundle ### Targets: ### -all: resource$(EXEEXT) +all: resource$(EXEEXT) $(__resource_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f resource$(EXEEXT) + rm -rf resource.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,12 +148,36 @@ resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc) $(CXX) -o $@ $(RESOURCE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__resource___mac_rezcmd) $(__resource___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +resource.app/Contents: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p resource.app/Contents + mkdir -p resource.app/Contents/MacOS + mkdir -p resource.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/resource/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >resource.app/Contents/Info.plist + + + echo -n "APPL????" >resource.app/Contents/PkgInfo + + + ln -f resource$(EXEEXT) resource.app/Contents/MacOS/resource + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc resource.app/Contents/Resources/resource.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns resource.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@resource_bundle: resource.app/Contents resource_resource.o: $(srcdir)/resource.cpp $(CXXC) -c -o $@ $(RESOURCE_CXXFLAGS) $< resource_resource_rc.o: $(srcdir)/resource.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include uninstall: @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install resource_bundle uninstall diff --git a/contrib/samples/deprecated/treelay/Makefile.in b/contrib/samples/deprecated/treelay/Makefile.in index 9ca6992a11..874052bcb2 100644 --- a/contrib/samples/deprecated/treelay/Makefile.in +++ b/contrib/samples/deprecated/treelay/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TREELAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) TREELAY_OBJECTS = \ treelay_treelay.o \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - treelay$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o treelay$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__treelay___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C treelay$(EXEEXT) @COND_PLATFORM_WIN32_1@__treelay___win32rc = treelay_treelay_rc.o +@COND_PLATFORM_MACOSX_1@__treelay_bundle___depname = treelay_bundle ### Targets: ### -all: treelay$(EXEEXT) +all: treelay$(EXEEXT) $(__treelay_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f treelay$(EXEEXT) + rm -rf treelay.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,12 +148,36 @@ treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc) $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__treelay___mac_rezcmd) $(__treelay___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +treelay.app/Contents: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p treelay.app/Contents + mkdir -p treelay.app/Contents/MacOS + mkdir -p treelay.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/treelay/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >treelay.app/Contents/Info.plist + + + echo -n "APPL????" >treelay.app/Contents/PkgInfo + + + ln -f treelay$(EXEEXT) treelay.app/Contents/MacOS/treelay + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treelay.app/Contents/Resources/treelay.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns treelay.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@treelay_bundle: treelay.app/Contents treelay_treelay.o: $(srcdir)/treelay.cpp $(CXXC) -c -o $@ $(TREELAY_CXXFLAGS) $< treelay_treelay_rc.o: $(srcdir)/treelay.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include uninstall: @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install treelay_bundle uninstall diff --git a/contrib/samples/fl/Makefile.in b/contrib/samples/fl/Makefile.in index 7d5c6833eb..e1976de4de 100644 --- a/contrib/samples/fl/Makefile.in +++ b/contrib/samples/fl/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,40 +36,40 @@ top_srcdir = @top_srcdir@ FL_DEMO1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_DEMO1_OBJECTS = \ fl_demo1_fl_demo1.o \ $(__fl_demo1___win32rc) FL_DEMO2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_DEMO2_OBJECTS = \ fl_demo2_fl_demo2.o \ $(__fl_demo2___win32rc) FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_SAMPLE1_OBJECTS = \ fl_sample1_fl_sample1.o \ $(__fl_sample1___win32rc) FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_SAMPLE2_OBJECTS = \ fl_sample2_fl_sample2.o \ $(__fl_sample2___win32rc) FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include -DBMP_DIR=\"bitmaps/\" $(CXXFLAGS) FL_SAMPLE3_OBJECTS = \ fl_sample3_fl_sample3.o \ $(__fl_sample3___win32rc) @@ -97,9 +98,9 @@ LIBDIRNAME = $(top_builddir)lib @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1_1 = \ @COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg @COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1_1 = \ +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1_2 = \ @COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1_3 = -i $(top_srcdir)/src/odbc @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png @COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_18 = \ @@ -136,42 +137,42 @@ LIBDIRNAME = $(top_builddir)lib COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \ + $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ BMP_DIR="bitmaps/" -o fl_demo2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_5 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_5) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \ + $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ BMP_DIR="bitmaps/" -o fl_sample3$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_6 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_6) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \ + $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ BMP_DIR="bitmaps/" -o fl_sample2$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_7 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_7) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \ + $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ BMP_DIR="bitmaps/" -o fl_sample1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_8 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_8) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_18) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1_2) \ - $(__INC_ODBC_p_1) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -d \ + $(__INC_ODBC_p_1_3) $(__INC_REGEX_p_1_1) $(__INC_EXPAT_p_20) -i $(srcdir) \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -d \ BMP_DIR="bitmaps/" -o fl_demo1$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_9 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_9) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -188,94 +189,223 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__fl_demo1___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_demo1$(EXEEXT) @COND_PLATFORM_WIN32_1@__fl_demo1___win32rc = fl_demo1_fl_demo1_rc.o +@COND_PLATFORM_MACOSX_1@__fl_demo1_bundle___depname = fl_demo1_bundle @COND_PLATFORM_MAC_1@__fl_demo2___mac_rezcmd = $(__MACOSX_RESOURCES_p_5) @COND_PLATFORM_MAC_1@__fl_demo2___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_demo2$(EXEEXT) @COND_PLATFORM_WIN32_1@__fl_demo2___win32rc = fl_demo2_fl_demo2_rc.o +@COND_PLATFORM_MACOSX_1@__fl_demo2_bundle___depname = fl_demo2_bundle @COND_PLATFORM_MAC_1@__fl_sample1___mac_rezcmd = $(__MACOSX_RESOURCES_p_8) @COND_PLATFORM_MAC_1@__fl_sample1___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample1$(EXEEXT) @COND_PLATFORM_WIN32_1@__fl_sample1___win32rc = fl_sample1_fl_sample1_rc.o +@COND_PLATFORM_MACOSX_1@__fl_sample1_bundle___depname = fl_sample1_bundle @COND_PLATFORM_MAC_1@__fl_sample2___mac_rezcmd = $(__MACOSX_RESOURCES_p_7) @COND_PLATFORM_MAC_1@__fl_sample2___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample2$(EXEEXT) @COND_PLATFORM_WIN32_1@__fl_sample2___win32rc = fl_sample2_fl_sample2_rc.o +@COND_PLATFORM_MACOSX_1@__fl_sample2_bundle___depname = fl_sample2_bundle @COND_PLATFORM_MAC_1@__fl_sample3___mac_rezcmd = $(__MACOSX_RESOURCES_p_6) @COND_PLATFORM_MAC_1@__fl_sample3___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fl_sample3$(EXEEXT) @COND_PLATFORM_WIN32_1@__fl_sample3___win32rc = fl_sample3_fl_sample3_rc.o +@COND_PLATFORM_MACOSX_1@__fl_sample3_bundle___depname = fl_sample3_bundle ### Targets: ### -all: fl_demo1$(EXEEXT) fl_demo2$(EXEEXT) fl_sample1$(EXEEXT) fl_sample2$(EXEEXT) fl_sample3$(EXEEXT) +all: fl_demo1$(EXEEXT) $(__fl_demo1_bundle___depname) fl_demo2$(EXEEXT) $(__fl_demo2_bundle___depname) fl_sample1$(EXEEXT) $(__fl_sample1_bundle___depname) fl_sample2$(EXEEXT) $(__fl_sample2_bundle___depname) fl_sample3$(EXEEXT) $(__fl_sample3_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f fl_demo1$(EXEEXT) + rm -rf fl_demo1.app rm -f fl_demo2$(EXEEXT) + rm -rf fl_demo2.app rm -f fl_sample1$(EXEEXT) + rm -rf fl_sample1.app rm -f fl_sample2$(EXEEXT) + rm -rf fl_sample2.app rm -f fl_sample3$(EXEEXT) + rm -rf fl_sample3.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc) $(CXX) -o $@ $(FL_DEMO1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__fl_demo1___mac_rezcmd) $(__fl_demo1___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +fl_demo1.app/Contents: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p fl_demo1.app/Contents + mkdir -p fl_demo1.app/Contents/MacOS + mkdir -p fl_demo1.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/fl_demo1/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >fl_demo1.app/Contents/Info.plist + + + echo -n "APPL????" >fl_demo1.app/Contents/PkgInfo + + + ln -f fl_demo1$(EXEEXT) fl_demo1.app/Contents/MacOS/fl_demo1 + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo1.app/Contents/Resources/fl_demo1.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo1.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@fl_demo1_bundle: fl_demo1.app/Contents fl_demo1_fl_demo1.o: $(srcdir)/fl_demo1.cpp $(CXXC) -c -o $@ $(FL_DEMO1_CXXFLAGS) $< fl_demo1_fl_demo1_rc.o: $(srcdir)/fl_demo1.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc) $(CXX) -o $@ $(FL_DEMO2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__fl_demo2___mac_rezcmd) $(__fl_demo2___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +fl_demo2.app/Contents: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p fl_demo2.app/Contents + mkdir -p fl_demo2.app/Contents/MacOS + mkdir -p fl_demo2.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/fl_demo2/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >fl_demo2.app/Contents/Info.plist + + + echo -n "APPL????" >fl_demo2.app/Contents/PkgInfo + + + ln -f fl_demo2$(EXEEXT) fl_demo2.app/Contents/MacOS/fl_demo2 + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_demo2.app/Contents/Resources/fl_demo2.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns fl_demo2.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@fl_demo2_bundle: fl_demo2.app/Contents fl_demo2_fl_demo2.o: $(srcdir)/fl_demo2.cpp $(CXXC) -c -o $@ $(FL_DEMO2_CXXFLAGS) $< fl_demo2_fl_demo2_rc.o: $(srcdir)/fl_demo2.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc) $(CXX) -o $@ $(FL_SAMPLE1_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__fl_sample1___mac_rezcmd) $(__fl_sample1___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +fl_sample1.app/Contents: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p fl_sample1.app/Contents + mkdir -p fl_sample1.app/Contents/MacOS + mkdir -p fl_sample1.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/fl_sample1/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >fl_sample1.app/Contents/Info.plist + + + echo -n "APPL????" >fl_sample1.app/Contents/PkgInfo + + + ln -f fl_sample1$(EXEEXT) fl_sample1.app/Contents/MacOS/fl_sample1 + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample1.app/Contents/Resources/fl_sample1.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample1.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@fl_sample1_bundle: fl_sample1.app/Contents fl_sample1_fl_sample1.o: $(srcdir)/fl_sample1.cpp $(CXXC) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $< fl_sample1_fl_sample1_rc.o: $(srcdir)/fl_sample1.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc) $(CXX) -o $@ $(FL_SAMPLE2_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__fl_sample2___mac_rezcmd) $(__fl_sample2___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +fl_sample2.app/Contents: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p fl_sample2.app/Contents + mkdir -p fl_sample2.app/Contents/MacOS + mkdir -p fl_sample2.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/fl_sample2/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >fl_sample2.app/Contents/Info.plist + + + echo -n "APPL????" >fl_sample2.app/Contents/PkgInfo + + + ln -f fl_sample2$(EXEEXT) fl_sample2.app/Contents/MacOS/fl_sample2 + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample2.app/Contents/Resources/fl_sample2.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample2.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@fl_sample2_bundle: fl_sample2.app/Contents fl_sample2_fl_sample2.o: $(srcdir)/fl_sample2.cpp $(CXXC) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $< fl_sample2_fl_sample2_rc.o: $(srcdir)/fl_sample2.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc) $(CXX) -o $@ $(FL_SAMPLE3_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__fl_sample3___mac_rezcmd) $(__fl_sample3___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +fl_sample3.app/Contents: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p fl_sample3.app/Contents + mkdir -p fl_sample3.app/Contents/MacOS + mkdir -p fl_sample3.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/fl_sample3/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >fl_sample3.app/Contents/Info.plist + + + echo -n "APPL????" >fl_sample3.app/Contents/PkgInfo + + + ln -f fl_sample3$(EXEEXT) fl_sample3.app/Contents/MacOS/fl_sample3 + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fl_sample3.app/Contents/Resources/fl_sample3.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns fl_sample3.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@fl_sample3_bundle: fl_sample3.app/Contents fl_sample3_fl_sample3.o: $(srcdir)/fl_sample3.cpp $(CXXC) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $< fl_sample3_fl_sample3_rc.o: $(srcdir)/fl_sample3.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_1) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir ../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_22) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1_2) $(__INC_JPEG_p_1_1) $(__INC_PNG_p_18) $(__INC_ZLIB_p_1_3) $(__INC_ODBC_p_1_2) $(__INC_REGEX_p_1_3) $(__INC_EXPAT_p_19) --include-dir $(srcdir) $(__DLLFLAG_p_18) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include --define BMP_DIR="bitmaps/" install: all @@ -287,4 +417,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean fl_demo1_bundle fl_demo2_bundle fl_sample1_bundle fl_sample2_bundle fl_sample3_bundle install uninstall diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in index 633d49450d..58c5dd3959 100644 --- a/contrib/samples/gizmos/dynsash/Makefile.in +++ b/contrib/samples/gizmos/dynsash/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DYNSASH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) DYNSASH_OBJECTS = \ $(__dynsash___win32rc) \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - dynsash$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o dynsash$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -127,30 +128,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__dynsash___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C dynsash$(EXEEXT) @COND_PLATFORM_WIN32_1@__dynsash___win32rc = dynsash_sample_rc.o +@COND_PLATFORM_MACOSX_1@__dynsash_bundle___depname = dynsash_bundle ### Targets: ### -all: dynsash$(EXEEXT) +all: dynsash$(EXEEXT) $(__dynsash_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dynsash$(EXEEXT) + rm -rf dynsash.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc) $(CXX) -o $@ $(DYNSASH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dynsash___mac_rezcmd) $(__dynsash___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dynsash.app/Contents: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dynsash.app/Contents + mkdir -p dynsash.app/Contents/MacOS + mkdir -p dynsash.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dynsash/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dynsash.app/Contents/Info.plist + + + echo -n "APPL????" >dynsash.app/Contents/PkgInfo + + + ln -f dynsash$(EXEEXT) dynsash.app/Contents/MacOS/dynsash + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynsash.app/Contents/Resources/dynsash.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dynsash.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@dynsash_bundle: dynsash.app/Contents dynsash_dynsash.o: $(srcdir)/dynsash.cpp $(CXXC) -c -o $@ $(DYNSASH_CXXFLAGS) $< dynsash_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples install: all @@ -162,4 +188,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean dynsash_bundle install uninstall diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in index 4bfc1ecd8c..2bd328d31e 100644 --- a/contrib/samples/gizmos/dynsash_switch/Makefile.in +++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) DYNSASH_SWITCH_OBJECTS = \ $(__dynsash_switch___win32rc) \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - dynsash_switch$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -126,30 +127,56 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C dynsash_switch$(EXEEXT) @COND_PLATFORM_WIN32_1@__dynsash_switch___win32rc = \ @COND_PLATFORM_WIN32_1@ dynsash_switch_sample_rc.o +@COND_PLATFORM_MACOSX_1@__dynsash_switch_bundle___depname \ +@COND_PLATFORM_MACOSX_1@ = dynsash_switch_bundle ### Targets: ### -all: dynsash_switch$(EXEEXT) +all: dynsash_switch$(EXEEXT) $(__dynsash_switch_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dynsash_switch$(EXEEXT) + rm -rf dynsash_switch.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc) $(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dynsash_switch___mac_rezcmd) $(__dynsash_switch___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dynsash_switch.app/Contents: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dynsash_switch.app/Contents + mkdir -p dynsash_switch.app/Contents/MacOS + mkdir -p dynsash_switch.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dynsash_switch/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dynsash_switch.app/Contents/Info.plist + + + echo -n "APPL????" >dynsash_switch.app/Contents/PkgInfo + + + ln -f dynsash_switch$(EXEEXT) dynsash_switch.app/Contents/MacOS/dynsash_switch + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynsash_switch.app/Contents/Resources/dynsash_switch.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dynsash_switch.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@dynsash_switch_bundle: dynsash_switch.app/Contents dynsash_switch_dynsash_switch.o: $(srcdir)/dynsash_switch.cpp $(CXXC) -c -o $@ $(DYNSASH_SWITCH_CXXFLAGS) $< dynsash_switch_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples install: all @@ -161,4 +188,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean dynsash_switch_bundle install uninstall diff --git a/contrib/samples/gizmos/editlbox/Makefile.in b/contrib/samples/gizmos/editlbox/Makefile.in index 8672af5e9a..ede85ee428 100644 --- a/contrib/samples/gizmos/editlbox/Makefile.in +++ b/contrib/samples/gizmos/editlbox/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) TEST_OBJECTS = \ $(__test___win32rc) \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - test$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o test$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT) @COND_PLATFORM_WIN32_1@__test___win32rc = test_sample_rc.o +@COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle ### Targets: ### -all: test$(EXEEXT) +all: test$(EXEEXT) $(__test_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f test$(EXEEXT) + rm -rf test.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,9 +148,33 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__test___mac_rezcmd) $(__test___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p test.app/Contents + mkdir -p test.app/Contents/MacOS + mkdir -p test.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/test/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >test.app/Contents/Info.plist + + + echo -n "APPL????" >test.app/Contents/PkgInfo + + + ln -f test$(EXEEXT) test.app/Contents/MacOS/test + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test.app/Contents/Resources/test.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns test.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@test_bundle: test.app/Contents test_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples test_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install test_bundle uninstall diff --git a/contrib/samples/gizmos/led/Makefile.in b/contrib/samples/gizmos/led/Makefile.in index 4001517b38..c467147d2a 100644 --- a/contrib/samples/gizmos/led/Makefile.in +++ b/contrib/samples/gizmos/led/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ LED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) LED_OBJECTS = \ $(__led___win32rc) \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - led$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o led$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -123,19 +124,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__led___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__led___mac_setfilecmd = $(SETFILE) -a C led$(EXEEXT) @COND_PLATFORM_WIN32_1@__led___win32rc = led_sample_rc.o +@COND_PLATFORM_MACOSX_1@__led_bundle___depname = led_bundle ### Targets: ### -all: led$(EXEEXT) +all: led$(EXEEXT) $(__led_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f led$(EXEEXT) + rm -rf led.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -145,12 +147,36 @@ led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc) $(CXX) -o $@ $(LED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__led___mac_rezcmd) $(__led___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +led.app/Contents: led$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p led.app/Contents + mkdir -p led.app/Contents/MacOS + mkdir -p led.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/led/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >led.app/Contents/Info.plist + + + echo -n "APPL????" >led.app/Contents/PkgInfo + + + ln -f led$(EXEEXT) led.app/Contents/MacOS/led + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc led.app/Contents/Resources/led.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns led.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@led_bundle: led.app/Contents led_led.o: $(srcdir)/led.cpp $(CXXC) -c -o $@ $(LED_CXXFLAGS) $< led_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples uninstall: @@ -158,4 +184,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install led_bundle uninstall diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index e22c9fbfc6..82aa59fd6c 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib MTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) MTEST_OBJECTS = \ $(__mtest___win32rc) \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - mtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o mtest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__mtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C mtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__mtest___win32rc = mtest_sample_rc.o +@COND_PLATFORM_MACOSX_1@__mtest_bundle___depname = mtest_bundle ### Targets: ### -all: mtest$(EXEEXT) +all: mtest$(EXEEXT) $(__mtest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f mtest$(EXEEXT) + rm -rf mtest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,12 +148,36 @@ mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc) $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__mtest___mac_rezcmd) $(__mtest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +mtest.app/Contents: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p mtest.app/Contents + mkdir -p mtest.app/Contents/MacOS + mkdir -p mtest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/mtest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >mtest.app/Contents/Info.plist + + + echo -n "APPL????" >mtest.app/Contents/PkgInfo + + + ln -f mtest$(EXEEXT) mtest.app/Contents/MacOS/mtest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mtest.app/Contents/Resources/mtest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns mtest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@mtest_bundle: mtest.app/Contents mtest_mtest.o: $(srcdir)/mtest.cpp $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $< mtest_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples uninstall: @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install mtest_bundle uninstall diff --git a/contrib/samples/gizmos/splittree/Makefile.in b/contrib/samples/gizmos/splittree/Makefile.in index 47ecf176ce..4c6ecf7f70 100644 --- a/contrib/samples/gizmos/splittree/Makefile.in +++ b/contrib/samples/gizmos/splittree/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib SPLITTREE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) SPLITTREE_OBJECTS = \ $(__splittree___win32rc) \ @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - splittree$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o splittree$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__splittree___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C splittree$(EXEEXT) @COND_PLATFORM_WIN32_1@__splittree___win32rc = splittree_sample_rc.o +@COND_PLATFORM_MACOSX_1@__splittree_bundle___depname = splittree_bundle ### Targets: ### -all: splittree$(EXEEXT) +all: splittree$(EXEEXT) $(__splittree_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f splittree$(EXEEXT) + rm -rf splittree.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,9 +148,33 @@ splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc) $(CXX) -o $@ $(SPLITTREE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__splittree___mac_rezcmd) $(__splittree___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +splittree.app/Contents: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p splittree.app/Contents + mkdir -p splittree.app/Contents/MacOS + mkdir -p splittree.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/splittree/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >splittree.app/Contents/Info.plist + + + echo -n "APPL????" >splittree.app/Contents/PkgInfo + + + ln -f splittree$(EXEEXT) splittree.app/Contents/MacOS/splittree + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc splittree.app/Contents/Resources/splittree.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns splittree.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@splittree_bundle: splittree.app/Contents splittree_sample_rc.o: $(srcdir)/../../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples splittree_tree.o: $(srcdir)/tree.cpp $(CXXC) -c -o $@ $(SPLITTREE_CXXFLAGS) $< @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install splittree_bundle uninstall diff --git a/contrib/samples/mmedia/Makefile.in b/contrib/samples/mmedia/Makefile.in index 432dccfed2..99338d44fb 100644 --- a/contrib/samples/mmedia/Makefile.in +++ b/contrib/samples/mmedia/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib MMBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) MMBOARD_OBJECTS = \ mmboard_mmboard.o \ mmboard_mmbman.o \ @@ -106,9 +107,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ mmboard$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,19 +126,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__mmboard___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C mmboard$(EXEEXT) @COND_PLATFORM_WIN32_1@__mmboard___win32rc = mmboard_mmboard_rc.o +@COND_PLATFORM_MACOSX_1@__mmboard_bundle___depname = mmboard_bundle ### Targets: ### -all: mmboard$(EXEEXT) +all: mmboard$(EXEEXT) $(__mmboard_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f mmboard$(EXEEXT) + rm -rf mmboard.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -147,6 +149,30 @@ mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc) $(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__mmboard___mac_rezcmd) $(__mmboard___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +mmboard.app/Contents: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p mmboard.app/Contents + mkdir -p mmboard.app/Contents/MacOS + mkdir -p mmboard.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/mmboard/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >mmboard.app/Contents/Info.plist + + + echo -n "APPL????" >mmboard.app/Contents/PkgInfo + + + ln -f mmboard$(EXEEXT) mmboard.app/Contents/MacOS/mmboard + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mmboard.app/Contents/Resources/mmboard.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns mmboard.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@mmboard_bundle: mmboard.app/Contents mmboard_mmbman.o: $(srcdir)/mmbman.cpp $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $< @@ -155,7 +181,7 @@ mmboard_mmboard.o: $(srcdir)/mmboard.cpp $(CXXC) -c -o $@ $(MMBOARD_CXXFLAGS) $< mmboard_mmboard_rc.o: $(srcdir)/mmboard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include uninstall: @@ -163,4 +189,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install mmboard_bundle uninstall diff --git a/contrib/samples/ogl/ogledit/Makefile.in b/contrib/samples/ogl/ogledit/Makefile.in index 8cd48c985a..535753219e 100644 --- a/contrib/samples/ogl/ogledit/Makefile.in +++ b/contrib/samples/ogl/ogledit/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) OGLEDIT_OBJECTS = \ ogledit_ogledit.o \ @@ -108,9 +109,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -127,19 +128,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ogledit$(EXEEXT) @COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_ogledit_rc.o +@COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle ### Targets: ### -all: ogledit$(EXEEXT) +all: ogledit$(EXEEXT) $(__ogledit_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f ogledit$(EXEEXT) + rm -rf ogledit.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -149,6 +151,30 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc) $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__ogledit___mac_rezcmd) $(__ogledit___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p ogledit.app/Contents + mkdir -p ogledit.app/Contents/MacOS + mkdir -p ogledit.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/ogledit/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist + + + echo -n "APPL????" >ogledit.app/Contents/PkgInfo + + + ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@ogledit_bundle: ogledit.app/Contents ogledit_doc.o: $(srcdir)/doc.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< @@ -157,7 +183,7 @@ ogledit_ogledit.o: $(srcdir)/ogledit.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< ogledit_ogledit_rc.o: $(srcdir)/ogledit.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include ogledit_palette.o: $(srcdir)/palette.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< @@ -171,4 +197,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install ogledit_bundle uninstall diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in index e22235f422..e74abf9c5d 100644 --- a/contrib/samples/ogl/studio/Makefile.in +++ b/contrib/samples/ogl/studio/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../../samples \ + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \ -I$(srcdir)/../../../include $(CXXFLAGS) OGLEDIT_OBJECTS = \ ogledit_studio.o \ @@ -114,9 +115,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../../samples -i $(srcdir)/../../../include -o \ - ogledit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ + $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -133,15 +134,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ogledit$(EXEEXT) @COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_studio_rc.o +@COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle ### Targets: ### -all: ogledit$(EXEEXT) data +all: ogledit$(EXEEXT) $(__ogledit_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f ogledit$(EXEEXT) + rm -rf ogledit.app data: @mkdir -p . @@ -152,8 +155,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -163,6 +165,30 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc) $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__ogledit___mac_rezcmd) $(__ogledit___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p ogledit.app/Contents + mkdir -p ogledit.app/Contents/MacOS + mkdir -p ogledit.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/ogledit/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist + + + echo -n "APPL????" >ogledit.app/Contents/PkgInfo + + + ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@ogledit_bundle: ogledit.app/Contents ogledit_cspalette.o: $(srcdir)/cspalette.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< @@ -189,7 +215,7 @@ ogledit_studio.o: $(srcdir)/studio.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< ogledit_studio_rc.o: $(srcdir)/studio.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../../samples --include-dir $(srcdir)/../../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include ogledit_symbols.o: $(srcdir)/symbols.cpp $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< @@ -203,4 +229,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install ogledit_bundle uninstall diff --git a/contrib/samples/plot/Makefile.in b/contrib/samples/plot/Makefile.in index 4dd7edb6d0..09e835dd9c 100644 --- a/contrib/samples/plot/Makefile.in +++ b/contrib/samples/plot/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib PLOT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) PLOT_OBJECTS = \ plot_plot.o \ $(__plot___win32rc) @@ -105,9 +106,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ - plot$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ + plot$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +124,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C plot$(EXEEXT) @COND_PLATFORM_WIN32_1@__plot___win32rc = plot_plot_rc.o +@COND_PLATFORM_MACOSX_1@__plot_bundle___depname = plot_bundle ### Targets: ### -all: plot$(EXEEXT) +all: plot$(EXEEXT) $(__plot_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f plot$(EXEEXT) + rm -rf plot.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,12 +147,36 @@ plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc) $(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__plot___mac_rezcmd) $(__plot___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +plot.app/Contents: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p plot.app/Contents + mkdir -p plot.app/Contents/MacOS + mkdir -p plot.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/plot/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >plot.app/Contents/Info.plist + + + echo -n "APPL????" >plot.app/Contents/PkgInfo + + + ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc plot.app/Contents/Resources/plot.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns plot.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@plot_bundle: plot.app/Contents plot_plot.o: $(srcdir)/plot.cpp $(CXXC) -c -o $@ $(PLOT_CXXFLAGS) $< plot_plot_rc.o: $(srcdir)/plot.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include uninstall: @@ -159,4 +184,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install plot_bundle uninstall diff --git a/contrib/samples/stc/Makefile.in b/contrib/samples/stc/Makefile.in index f4f1d73cf6..e44eb50c45 100644 --- a/contrib/samples/stc/Makefile.in +++ b/contrib/samples/stc/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib STCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) STCTEST_OBJECTS = \ $(__stctest___win32rc) \ stctest_stctest.o @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,15 +125,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C stctest$(EXEEXT) @COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o +@COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle ### Targets: ### -all: stctest$(EXEEXT) data +all: stctest$(EXEEXT) $(__stctest_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f stctest$(EXEEXT) + rm -rf stctest.app data: @mkdir -p . @@ -143,8 +146,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -154,9 +156,33 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__stctest___mac_rezcmd) $(__stctest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p stctest.app/Contents + mkdir -p stctest.app/Contents/MacOS + mkdir -p stctest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/stctest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >stctest.app/Contents/Info.plist + + + echo -n "APPL????" >stctest.app/Contents/PkgInfo + + + ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns stctest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@stctest_bundle: stctest.app/Contents stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples stctest_stctest.o: $(srcdir)/stctest.cpp $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< @@ -167,4 +193,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install stctest_bundle uninstall diff --git a/contrib/samples/svg/Makefile.in b/contrib/samples/svg/Makefile.in index e0bf0aecd0..fc6afd4611 100644 --- a/contrib/samples/svg/Makefile.in +++ b/contrib/samples/svg/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib SVGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) SVGTEST_OBJECTS = \ $(__svgtest___win32rc) \ svgtest_svgtest.o @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C svgtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o +@COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle ### Targets: ### -all: svgtest$(EXEEXT) +all: svgtest$(EXEEXT) $(__svgtest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f svgtest$(EXEEXT) + rm -rf svgtest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,9 +148,33 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__svgtest___mac_rezcmd) $(__svgtest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +svgtest.app/Contents: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p svgtest.app/Contents + mkdir -p svgtest.app/Contents/MacOS + mkdir -p svgtest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/svgtest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >svgtest.app/Contents/Info.plist + + + echo -n "APPL????" >svgtest.app/Contents/PkgInfo + + + ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc svgtest.app/Contents/Resources/svgtest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@svgtest_bundle: svgtest.app/Contents svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples svgtest_svgtest.o: $(srcdir)/svgtest.cpp $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install svgtest_bundle uninstall diff --git a/contrib/samples/xrc/Makefile.in b/contrib/samples/xrc/Makefile.in index 99c8be4823..bb5a0559fe 100644 --- a/contrib/samples/xrc/Makefile.in +++ b/contrib/samples/xrc/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) XRCDEMO_OBJECTS = \ xrcdemo_xrcdemo.o \ xrcdemo_myframe.o \ @@ -108,9 +109,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -132,15 +133,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o +@COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle ### Targets: ### -all: xrcdemo$(EXEEXT) data +all: xrcdemo$(EXEEXT) $(__xrcdemo_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f xrcdemo$(EXEEXT) + rm -rf xrcdemo.app data: @mkdir -p ./rc @@ -151,8 +154,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -164,6 +166,30 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p xrcdemo.app/Contents + mkdir -p xrcdemo.app/Contents/MacOS + mkdir -p xrcdemo.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/xrcdemo/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >xrcdemo.app/Contents/Info.plist + + + echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo + + + ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@xrcdemo_bundle: xrcdemo.app/Contents xrcdemo_custclas.o: $(srcdir)/custclas.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< @@ -178,10 +204,10 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install uninstall xrcdemo_bundle diff --git a/contrib/utils/wxrc/Makefile.in b/contrib/utils/wxrc/Makefile.in index fc0eb56866..a0129693a6 100644 --- a/contrib/utils/wxrc/Makefile.in +++ b/contrib/utils/wxrc/Makefile.in @@ -88,13 +88,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ all: wxrc$(EXEEXT) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f wxrc$(EXEEXT) distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 2466eba2fd..f857c3dee1 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ BOMBS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) BOMBS_OBJECTS = \ bombs_bombs.o \ bombs_bombs1.o \ @@ -106,8 +107,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o bombs$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o bombs$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,15 +125,38 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C bombs$(EXEEXT) @COND_PLATFORM_WIN32_1@__bombs___win32rc = bombs_bombs_rc.o +@COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle ### Targets: ### -all: bombs$(EXEEXT) +all: bombs$(EXEEXT) $(__bombs_bundle___depname) bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc) $(CXX) -o $@ $(BOMBS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__bombs___mac_rezcmd) $(__bombs___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +bombs.app/Contents: bombs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p bombs.app/Contents + mkdir -p bombs.app/Contents/MacOS + mkdir -p bombs.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/bombs/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >bombs.app/Contents/Info.plist + + + echo -n "APPL????" >bombs.app/Contents/PkgInfo + + + ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc bombs.app/Contents/Resources/bombs.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns bombs.app/Contents/Resources/wxmac.icns bombs_bombs.o: $(srcdir)/bombs.cpp $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $< @@ -141,19 +165,21 @@ bombs_bombs1.o: $(srcdir)/bombs1.cpp $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $< bombs_bombs_rc.o: $(srcdir)/bombs.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + +@COND_PLATFORM_MACOSX_1@bombs_bundle: bombs.app/Contents bombs_game.o: $(srcdir)/game.cpp $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $< clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f bombs$(EXEEXT) + rm -rf bombs.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -165,4 +191,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all bombs_bundle clean distclean install uninstall diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in index c7f5d9d727..96301fbf7c 100644 --- a/demos/dbbrowse/Makefile.in +++ b/demos/dbbrowse/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DBBROWSE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DBBROWSE_OBJECTS = \ dbbrowse_dbbrowse.o \ dbbrowse_doc.o \ @@ -111,8 +112,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o dbbrowse$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbbrowse$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -141,29 +142,55 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \ @COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbbrowse$(EXEEXT) @COND_PLATFORM_WIN32_1@__dbbrowse___win32rc = dbbrowse_dbbrowse_rc.o +@COND_PLATFORM_MACOSX_1@__dbbrowse_bundle___depname = dbbrowse_bundle ### Targets: ### -all: dbbrowse$(EXEEXT) +all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dbbrowse$(EXEEXT) + rm -rf dbbrowse.app dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc) $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dbbrowse___mac_rezcmd) $(__dbbrowse___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dbbrowse.app/Contents: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dbbrowse.app/Contents + mkdir -p dbbrowse.app/Contents/MacOS + mkdir -p dbbrowse.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dbbrowse/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dbbrowse.app/Contents/Info.plist + + + echo -n "APPL????" >dbbrowse.app/Contents/PkgInfo + + + ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbbrowse.app/Contents/Resources/dbbrowse.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< +@COND_PLATFORM_MACOSX_1@dbbrowse_bundle: dbbrowse.app/Contents + dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< @@ -184,8 +211,7 @@ dbbrowse_tabpgwin.o: $(srcdir)/tabpgwin.cpp $(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $< distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -197,4 +223,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean dbbrowse_bundle distclean install uninstall diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 0a39ede2e8..413f99c03a 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ FORTY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) FORTY_OBJECTS = \ forty_forty.o \ forty_canvas.o \ @@ -111,8 +112,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o forty$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o forty$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -132,24 +133,49 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C forty$(EXEEXT) @COND_PLATFORM_WIN32_1@__forty___win32rc = forty_forty_rc.o +@COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle ### Targets: ### -all: forty$(EXEEXT) +all: forty$(EXEEXT) $(__forty_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f forty$(EXEEXT) + rm -rf forty.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc) $(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__forty___mac_rezcmd) $(__forty___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +forty.app/Contents: forty$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p forty.app/Contents + mkdir -p forty.app/Contents/MacOS + mkdir -p forty.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/forty/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >forty.app/Contents/Info.plist + + + echo -n "APPL????" >forty.app/Contents/PkgInfo + + + ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc forty.app/Contents/Resources/forty.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns forty.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@forty_bundle: forty.app/Contents forty_canvas.o: $(srcdir)/canvas.cpp $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< @@ -161,7 +187,7 @@ forty_forty.o: $(srcdir)/forty.cpp $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< forty_forty_rc.o: $(srcdir)/forty.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples forty_game.o: $(srcdir)/game.cpp $(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $< @@ -188,4 +214,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean forty_bundle install uninstall diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index ab76b72d1c..07e6ee2fcb 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ FRACTAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) FRACTAL_OBJECTS = \ fractal_fractal.o \ $(__fractal___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o fractal$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o fractal$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__fractal___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C fractal$(EXEEXT) @COND_PLATFORM_WIN32_1@__fractal___win32rc = fractal_fractal_rc.o +@COND_PLATFORM_MACOSX_1@__fractal_bundle___depname = fractal_bundle ### Targets: ### -all: fractal$(EXEEXT) +all: fractal$(EXEEXT) $(__fractal_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f fractal$(EXEEXT) + rm -rf fractal.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc) $(CXX) -o $@ $(FRACTAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__fractal___mac_rezcmd) $(__fractal___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +fractal.app/Contents: fractal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p fractal.app/Contents + mkdir -p fractal.app/Contents/MacOS + mkdir -p fractal.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/fractal/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >fractal.app/Contents/Info.plist + + + echo -n "APPL????" >fractal.app/Contents/PkgInfo + + + ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fractal.app/Contents/Resources/fractal.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns fractal.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@fractal_bundle: fractal.app/Contents fractal_fractal.o: $(srcdir)/fractal.cpp $(CXXC) -c -o $@ $(FRACTAL_CXXFLAGS) $< fractal_fractal_rc.o: $(srcdir)/fractal.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean fractal_bundle install uninstall diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index da4a91c638..8d4316f0eb 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib LIFE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) LIFE_OBJECTS = \ life_life.o \ life_dialogs.o \ @@ -107,8 +108,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o life$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o life$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__life___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C life$(EXEEXT) @COND_PLATFORM_WIN32_1@__life___win32rc = life_life_rc.o +@COND_PLATFORM_MACOSX_1@__life_bundle___depname = life_bundle ### Targets: ### -all: life$(EXEEXT) data +all: life$(EXEEXT) $(__life_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f life$(EXEEXT) + rm -rf life.app data: @mkdir -p . @@ -144,8 +147,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -155,6 +157,30 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc) $(CXX) -o $@ $(LIFE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__life___mac_rezcmd) $(__life___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +life.app/Contents: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p life.app/Contents + mkdir -p life.app/Contents/MacOS + mkdir -p life.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/life/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >life.app/Contents/Info.plist + + + echo -n "APPL????" >life.app/Contents/PkgInfo + + + ln -f life$(EXEEXT) life.app/Contents/MacOS/life + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc life.app/Contents/Resources/life.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns life.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@life_bundle: life.app/Contents life_dialogs.o: $(srcdir)/dialogs.cpp $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< @@ -166,7 +192,7 @@ life_life.o: $(srcdir)/life.cpp $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< life_life_rc.o: $(srcdir)/life.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples life_reader.o: $(srcdir)/reader.cpp $(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $< @@ -177,4 +203,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install life_bundle uninstall diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index eac5e1e4ea..2731d978f9 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib WXPOEM_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) WXPOEM_OBJECTS = \ wxpoem_wxpoem.o \ $(__wxpoem___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o wxpoem$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxpoem$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__wxpoem___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxpoem$(EXEEXT) @COND_PLATFORM_WIN32_1@__wxpoem___win32rc = wxpoem_wxpoem_rc.o +@COND_PLATFORM_MACOSX_1@__wxpoem_bundle___depname = wxpoem_bundle ### Targets: ### -all: wxpoem$(EXEEXT) data +all: wxpoem$(EXEEXT) $(__wxpoem_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f wxpoem$(EXEEXT) + rm -rf wxpoem.app data: @mkdir -p . @@ -144,8 +147,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,15 +159,39 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc) $(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wxpoem___mac_rezcmd) $(__wxpoem___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +wxpoem.app/Contents: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p wxpoem.app/Contents + mkdir -p wxpoem.app/Contents/MacOS + mkdir -p wxpoem.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/wxpoem/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >wxpoem.app/Contents/Info.plist + + + echo -n "APPL????" >wxpoem.app/Contents/PkgInfo + + + ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxpoem.app/Contents/Resources/wxpoem.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@wxpoem_bundle: wxpoem.app/Contents wxpoem_wxpoem.o: $(srcdir)/wxpoem.cpp $(CXXC) -c -o $@ $(WXPOEM_CXXFLAGS) $< wxpoem_wxpoem_rc.o: $(srcdir)/wxpoem.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install uninstall wxpoem_bundle diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index 88201cb899..03a0fd45ad 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) ACCESSTEST_OBJECTS = \ accesstest_accesstest.o \ $(__accesstest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o accesstest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o accesstest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__accesstest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C accesstest$(EXEEXT) @COND_PLATFORM_WIN32_1@__accesstest___win32rc = accesstest_accesstest_rc.o +@COND_PLATFORM_MACOSX_1@__accesstest_bundle___depname = accesstest_bundle ### Targets: ### -all: accesstest$(EXEEXT) +all: accesstest$(EXEEXT) $(__accesstest_bundle___depname) accesstest$(EXEEXT): $(ACCESSTEST_OBJECTS) $(__accesstest___win32rc) $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__accesstest___mac_rezcmd) $(__accesstest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +accesstest.app/Contents: accesstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p accesstest.app/Contents + mkdir -p accesstest.app/Contents/MacOS + mkdir -p accesstest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/accesstest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >accesstest.app/Contents/Info.plist + + + echo -n "APPL????" >accesstest.app/Contents/PkgInfo + + + ln -f accesstest$(EXEEXT) accesstest.app/Contents/MacOS/accesstest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc accesstest.app/Contents/Resources/accesstest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns accesstest.app/Contents/Resources/wxmac.icns accesstest_accesstest.o: $(srcdir)/accesstest.cpp $(CXXC) -c -o $@ $(ACCESSTEST_CXXFLAGS) $< accesstest_accesstest_rc.o: $(srcdir)/accesstest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + +@COND_PLATFORM_MACOSX_1@accesstest_bundle: accesstest.app/Contents clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f accesstest$(EXEEXT) + rm -rf accesstest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all accesstest_bundle clean distclean install uninstall diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 65304e88d9..5d7de9c60f 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ ARTTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) ARTTEST_OBJECTS = \ arttest_arttest.o \ arttest_artbrows.o \ @@ -105,8 +106,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o arttest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o arttest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -123,15 +124,38 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__arttest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C arttest$(EXEEXT) @COND_PLATFORM_WIN32_1@__arttest___win32rc = arttest_arttest_rc.o +@COND_PLATFORM_MACOSX_1@__arttest_bundle___depname = arttest_bundle ### Targets: ### -all: arttest$(EXEEXT) +all: arttest$(EXEEXT) $(__arttest_bundle___depname) arttest$(EXEEXT): $(ARTTEST_OBJECTS) $(__arttest___win32rc) $(CXX) -o $@ $(ARTTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__arttest___mac_rezcmd) $(__arttest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +arttest.app/Contents: arttest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p arttest.app/Contents + mkdir -p arttest.app/Contents/MacOS + mkdir -p arttest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/arttest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >arttest.app/Contents/Info.plist + + + echo -n "APPL????" >arttest.app/Contents/PkgInfo + + + ln -f arttest$(EXEEXT) arttest.app/Contents/MacOS/arttest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc arttest.app/Contents/Resources/arttest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns arttest.app/Contents/Resources/wxmac.icns arttest_artbrows.o: $(srcdir)/artbrows.cpp $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $< @@ -140,16 +164,18 @@ arttest_arttest.o: $(srcdir)/arttest.cpp $(CXXC) -c -o $@ $(ARTTEST_CXXFLAGS) $< arttest_arttest_rc.o: $(srcdir)/arttest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples + +@COND_PLATFORM_MACOSX_1@arttest_bundle: arttest.app/Contents clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f arttest$(EXEEXT) + rm -rf arttest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -161,4 +187,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all arttest_bundle clean distclean install uninstall diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index df0bc03626..095441c474 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CALENDAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) CALENDAR_OBJECTS = \ calendar_calendar.o \ $(__calendar___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o calendar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o calendar$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -125,30 +126,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__calendar___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C calendar$(EXEEXT) @COND_PLATFORM_WIN32_1@__calendar___win32rc = calendar_calendar_rc.o +@COND_PLATFORM_MACOSX_1@__calendar_bundle___depname = calendar_bundle ### Targets: ### -all: calendar$(EXEEXT) +all: calendar$(EXEEXT) $(__calendar_bundle___depname) calendar$(EXEEXT): $(CALENDAR_OBJECTS) $(__calendar___win32rc) $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__calendar___mac_rezcmd) $(__calendar___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +calendar.app/Contents: calendar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p calendar.app/Contents + mkdir -p calendar.app/Contents/MacOS + mkdir -p calendar.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/calendar/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >calendar.app/Contents/Info.plist + + + echo -n "APPL????" >calendar.app/Contents/PkgInfo + + + ln -f calendar$(EXEEXT) calendar.app/Contents/MacOS/calendar + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc calendar.app/Contents/Resources/calendar.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns calendar.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@calendar_bundle: calendar.app/Contents calendar_calendar.o: $(srcdir)/calendar.cpp $(CXXC) -c -o $@ $(CALENDAR_CXXFLAGS) $< calendar_calendar_rc.o: $(srcdir)/calendar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f calendar$(EXEEXT) + rm -rf calendar.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -160,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all calendar_bundle clean distclean install uninstall diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index c889c741f4..7e60ecbb76 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CARET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) CARET_OBJECTS = \ caret_caret.o \ $(__caret___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o caret$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o caret$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__caret___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C caret$(EXEEXT) @COND_PLATFORM_WIN32_1@__caret___win32rc = caret_caret_rc.o +@COND_PLATFORM_MACOSX_1@__caret_bundle___depname = caret_bundle ### Targets: ### -all: caret$(EXEEXT) +all: caret$(EXEEXT) $(__caret_bundle___depname) caret$(EXEEXT): $(CARET_OBJECTS) $(__caret___win32rc) $(CXX) -o $@ $(CARET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__caret___mac_rezcmd) $(__caret___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +caret.app/Contents: caret$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p caret.app/Contents + mkdir -p caret.app/Contents/MacOS + mkdir -p caret.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/caret/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >caret.app/Contents/Info.plist + + + echo -n "APPL????" >caret.app/Contents/PkgInfo + + + ln -f caret$(EXEEXT) caret.app/Contents/MacOS/caret + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc caret.app/Contents/Resources/caret.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns caret.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@caret_bundle: caret.app/Contents caret_caret.o: $(srcdir)/caret.cpp $(CXXC) -c -o $@ $(CARET_CXXFLAGS) $< caret_caret_rc.o: $(srcdir)/caret.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f caret$(EXEEXT) + rm -rf caret.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all caret_bundle clean distclean install uninstall diff --git a/samples/checklst/Makefile.in b/samples/checklst/Makefile.in index 6d33918e7e..3b725bb71e 100644 --- a/samples/checklst/Makefile.in +++ b/samples/checklst/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CHECKLST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) CHECKLST_OBJECTS = \ checklst_checklst.o \ $(__checklst___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o checklst$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o checklst$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__checklst___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C checklst$(EXEEXT) @COND_PLATFORM_WIN32_1@__checklst___win32rc = checklst_checklst_rc.o +@COND_PLATFORM_MACOSX_1@__checklst_bundle___depname = checklst_bundle ### Targets: ### -all: checklst$(EXEEXT) +all: checklst$(EXEEXT) $(__checklst_bundle___depname) checklst$(EXEEXT): $(CHECKLST_OBJECTS) $(__checklst___win32rc) $(CXX) -o $@ $(CHECKLST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__checklst___mac_rezcmd) $(__checklst___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +checklst.app/Contents: checklst$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p checklst.app/Contents + mkdir -p checklst.app/Contents/MacOS + mkdir -p checklst.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/checklst/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >checklst.app/Contents/Info.plist + + + echo -n "APPL????" >checklst.app/Contents/PkgInfo + + + ln -f checklst$(EXEEXT) checklst.app/Contents/MacOS/checklst + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc checklst.app/Contents/Resources/checklst.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns checklst.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@checklst_bundle: checklst.app/Contents checklst_checklst.o: $(srcdir)/checklst.cpp $(CXXC) -c -o $@ $(CHECKLST_CXXFLAGS) $< checklst_checklst_rc.o: $(srcdir)/checklst.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f checklst$(EXEEXT) + rm -rf checklst.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all checklst_bundle clean distclean install uninstall diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index cf22fdaa3c..a778883dc6 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CONFTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) CONFTEST_OBJECTS = \ conftest_conftest.o \ $(__conftest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o conftest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o conftest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__conftest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C conftest$(EXEEXT) @COND_PLATFORM_WIN32_1@__conftest___win32rc = conftest_conftest_rc.o +@COND_PLATFORM_MACOSX_1@__conftest_bundle___depname = conftest_bundle ### Targets: ### -all: conftest$(EXEEXT) +all: conftest$(EXEEXT) $(__conftest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f conftest$(EXEEXT) + rm -rf conftest.app conftest$(EXEEXT): $(CONFTEST_OBJECTS) $(__conftest___win32rc) $(CXX) -o $@ $(CONFTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__conftest___mac_rezcmd) $(__conftest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +conftest.app/Contents: conftest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p conftest.app/Contents + mkdir -p conftest.app/Contents/MacOS + mkdir -p conftest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/conftest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >conftest.app/Contents/Info.plist + + + echo -n "APPL????" >conftest.app/Contents/PkgInfo + + + ln -f conftest$(EXEEXT) conftest.app/Contents/MacOS/conftest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc conftest.app/Contents/Resources/conftest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns conftest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@conftest_bundle: conftest.app/Contents conftest_conftest.o: $(srcdir)/conftest.cpp $(CXXC) -c -o $@ $(CONFTEST_CXXFLAGS) $< conftest_conftest_rc.o: $(srcdir)/conftest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean conftest_bundle distclean install uninstall diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index d62f750596..96171162cc 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -18,6 +18,7 @@ EXTRALIBS = @EXTRALIBS@ HOST_SUFFIX = @HOST_SUFFIX@ LDFLAGS = @LDFLAGS@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ @@ -87,14 +88,14 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ all: console$(EXEEXT) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f console$(EXEEXT) console$(EXEEXT): $(CONSOLE_OBJECTS) $(CXX) -o $@ $(CONSOLE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) - $(__console___mac_setfilecmd) + $(__console___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) console_console.o: $(srcdir)/console.cpp $(CXXC) -c -o $@ $(CONSOLE_CXXFLAGS) $< @@ -108,8 +109,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 5d3a7e189a..9bca87dff9 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CONTROLS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) CONTROLS_OBJECTS = \ controls_controls.o \ $(__controls___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o controls$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o controls$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__controls___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C controls$(EXEEXT) @COND_PLATFORM_WIN32_1@__controls___win32rc = controls_controls_rc.o +@COND_PLATFORM_MACOSX_1@__controls_bundle___depname = controls_bundle ### Targets: ### -all: controls$(EXEEXT) +all: controls$(EXEEXT) $(__controls_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f controls$(EXEEXT) + rm -rf controls.app controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc) $(CXX) -o $@ $(CONTROLS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__controls___mac_rezcmd) $(__controls___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +controls.app/Contents: controls$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p controls.app/Contents + mkdir -p controls.app/Contents/MacOS + mkdir -p controls.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/controls/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >controls.app/Contents/Info.plist + + + echo -n "APPL????" >controls.app/Contents/PkgInfo + + + ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc controls.app/Contents/Resources/controls.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns controls.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@controls_bundle: controls.app/Contents controls_controls.o: $(srcdir)/controls.cpp $(CXXC) -c -o $@ $(CONTROLS_CXXFLAGS) $< controls_controls_rc.o: $(srcdir)/controls.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean controls_bundle distclean install uninstall diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in index 57d2bc1625..04d3f68678 100644 --- a/samples/db/Makefile.in +++ b/samples/db/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DBTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DBTEST_OBJECTS = \ dbtest_dbtest.o \ dbtest_listdb.o \ @@ -105,8 +106,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o dbtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbtest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -126,33 +127,58 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \ @COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest_dbtest_rc.o +@COND_PLATFORM_MACOSX_1@__dbtest_bundle___depname = dbtest_bundle ### Targets: ### -all: dbtest$(EXEEXT) +all: dbtest$(EXEEXT) $(__dbtest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dbtest$(EXEEXT) + rm -rf dbtest.app dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc) $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ODBC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dbtest___mac_rezcmd) $(__dbtest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dbtest.app/Contents: dbtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dbtest.app/Contents + mkdir -p dbtest.app/Contents/MacOS + mkdir -p dbtest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dbtest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dbtest.app/Contents/Info.plist + + + echo -n "APPL????" >dbtest.app/Contents/PkgInfo + + + ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbtest.app/Contents/Resources/dbtest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@dbtest_bundle: dbtest.app/Contents dbtest_dbtest.o: $(srcdir)/dbtest.cpp $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< dbtest_dbtest_rc.o: $(srcdir)/dbtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples dbtest_listdb.o: $(srcdir)/listdb.cpp $(CXXC) -c -o $@ $(DBTEST_CXXFLAGS) $< distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -164,4 +190,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean dbtest_bundle distclean install uninstall diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 4539fa91a6..0cccfc04e9 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DIALOGS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DIALOGS_OBJECTS = \ dialogs_dialogs.o \ $(__dialogs___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o dialogs$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dialogs$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__dialogs___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C dialogs$(EXEEXT) @COND_PLATFORM_WIN32_1@__dialogs___win32rc = dialogs_dialogs_rc.o +@COND_PLATFORM_MACOSX_1@__dialogs_bundle___depname = dialogs_bundle ### Targets: ### -all: dialogs$(EXEEXT) data +all: dialogs$(EXEEXT) $(__dialogs_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dialogs$(EXEEXT) + rm -rf dialogs.app data: @mkdir -p . @@ -147,16 +150,39 @@ dialogs$(EXEEXT): $(DIALOGS_OBJECTS) $(__dialogs___win32rc) $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dialogs___mac_rezcmd) $(__dialogs___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dialogs.app/Contents: dialogs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dialogs.app/Contents + mkdir -p dialogs.app/Contents/MacOS + mkdir -p dialogs.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dialogs/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dialogs.app/Contents/Info.plist + + + echo -n "APPL????" >dialogs.app/Contents/PkgInfo + + + ln -f dialogs$(EXEEXT) dialogs.app/Contents/MacOS/dialogs + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dialogs.app/Contents/Resources/dialogs.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dialogs.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@dialogs_bundle: dialogs.app/Contents dialogs_dialogs.o: $(srcdir)/dialogs.cpp $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $< dialogs_dialogs_rc.o: $(srcdir)/dialogs.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -168,4 +194,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data dialogs_bundle distclean install uninstall diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 584319468b..9bd21529b7 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib NETTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) NETTEST_OBJECTS = \ nettest_nettest.o \ $(__nettest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o nettest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o nettest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C nettest$(EXEEXT) @COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_nettest_rc.o +@COND_PLATFORM_MACOSX_1@__nettest_bundle___depname = nettest_bundle ### Targets: ### -all: nettest$(EXEEXT) +all: nettest$(EXEEXT) $(__nettest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f nettest$(EXEEXT) + rm -rf nettest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__nettest___mac_rezcmd) $(__nettest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +nettest.app/Contents: nettest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p nettest.app/Contents + mkdir -p nettest.app/Contents/MacOS + mkdir -p nettest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/nettest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >nettest.app/Contents/Info.plist + + + echo -n "APPL????" >nettest.app/Contents/PkgInfo + + + ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc nettest.app/Contents/Resources/nettest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns nettest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@nettest_bundle: nettest.app/Contents nettest_nettest.o: $(srcdir)/nettest.cpp $(CXXC) -c -o $@ $(NETTEST_CXXFLAGS) $< nettest_nettest_rc.o: $(srcdir)/nettest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install nettest_bundle uninstall diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 48d1566c73..0cb1801f90 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DISPLAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DISPLAY_OBJECTS = \ $(__display___win32rc) \ display_display.o @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o display$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o display$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__display___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C display$(EXEEXT) @COND_PLATFORM_WIN32_1@__display___win32rc = display_sample_rc.o +@COND_PLATFORM_MACOSX_1@__display_bundle___depname = display_bundle ### Targets: ### -all: display$(EXEEXT) +all: display$(EXEEXT) $(__display_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f display$(EXEEXT) + rm -rf display.app display$(EXEEXT): $(DISPLAY_OBJECTS) $(__display___win32rc) $(CXX) -o $@ $(DISPLAY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__display___mac_rezcmd) $(__display___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +display.app/Contents: display$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p display.app/Contents + mkdir -p display.app/Contents/MacOS + mkdir -p display.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/display/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >display.app/Contents/Info.plist + + + echo -n "APPL????" >display.app/Contents/PkgInfo + + + ln -f display$(EXEEXT) display.app/Contents/MacOS/display + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc display.app/Contents/Resources/display.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns display.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@display_bundle: display.app/Contents display_display.o: $(srcdir)/display.cpp $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $< display_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean display_bundle distclean install uninstall diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index bd6a900566..92bfd6e55c 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DND_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DND_OBJECTS = \ dnd_dnd.o \ $(__dnd___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o dnd$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dnd$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -121,15 +122,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__dnd___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__dnd___mac_setfilecmd = $(SETFILE) -a C dnd$(EXEEXT) @COND_PLATFORM_WIN32_1@__dnd___win32rc = dnd_dnd_rc.o +@COND_PLATFORM_MACOSX_1@__dnd_bundle___depname = dnd_bundle ### Targets: ### -all: dnd$(EXEEXT) data +all: dnd$(EXEEXT) $(__dnd_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dnd$(EXEEXT) + rm -rf dnd.app data: @mkdir -p . @@ -140,19 +143,42 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dnd$(EXEEXT): $(DND_OBJECTS) $(__dnd___win32rc) $(CXX) -o $@ $(DND_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dnd___mac_rezcmd) $(__dnd___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dnd.app/Contents: dnd$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dnd.app/Contents + mkdir -p dnd.app/Contents/MacOS + mkdir -p dnd.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dnd/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dnd.app/Contents/Info.plist + + + echo -n "APPL????" >dnd.app/Contents/PkgInfo + + + ln -f dnd$(EXEEXT) dnd.app/Contents/MacOS/dnd + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dnd.app/Contents/Resources/dnd.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dnd.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@dnd_bundle: dnd.app/Contents dnd_dnd.o: $(srcdir)/dnd.cpp $(CXXC) -c -o $@ $(DND_CXXFLAGS) $< dnd_dnd_rc.o: $(srcdir)/dnd.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -164,4 +190,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean dnd_bundle install uninstall diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 4bd476c1c1..d86bbeb91b 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DOCVIEW_OBJECTS = \ docview_docview.o \ docview_doc.o \ @@ -48,8 +49,7 @@ LIBDIRNAME = $(top_builddir)lib @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \ -@COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ -@COND_TOOLKIT_MAC@ ../../samples/sample.r +@COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -120,30 +120,55 @@ COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o docview$(EXEEXT) $(MACOSX_RESOURCES) \ - chart.r doc.r docview.r mondrian.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o docview$(EXEEXT) \ + $(MACOSX_RESOURCES) chart.r doc.r docview.r mondrian.r @COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(COND_PLATFORM_MAC_1___docview___mac_rezcmd) @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o +@COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle ### Targets: ### -all: docview$(EXEEXT) +all: docview$(EXEEXT) $(__docview_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f docview$(EXEEXT) + rm -rf docview.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p docview.app/Contents + mkdir -p docview.app/Contents/MacOS + mkdir -p docview.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/docview/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >docview.app/Contents/Info.plist + + + echo -n "APPL????" >docview.app/Contents/PkgInfo + + + ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc docview.app/Contents/Resources/docview.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns docview.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@docview_bundle: docview.app/Contents docview_doc.o: $(srcdir)/doc.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< @@ -152,7 +177,7 @@ docview_docview.o: $(srcdir)/docview.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview_rc.o: $(srcdir)/docview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples docview_view.o: $(srcdir)/view.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< @@ -167,4 +192,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean docview_bundle install uninstall diff --git a/samples/docvwmdi/Makefile.in b/samples/docvwmdi/Makefile.in index cfbe0d8db4..ae825151cd 100644 --- a/samples/docvwmdi/Makefile.in +++ b/samples/docvwmdi/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DOCVIEW_OBJECTS = \ docview_docview.o \ docview_doc.o \ @@ -106,8 +107,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o docview$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o docview$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,24 +125,49 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT) @COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o +@COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle ### Targets: ### -all: docview$(EXEEXT) +all: docview$(EXEEXT) $(__docview_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f docview$(EXEEXT) + rm -rf docview.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__docview___mac_rezcmd) $(__docview___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p docview.app/Contents + mkdir -p docview.app/Contents/MacOS + mkdir -p docview.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/docview/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >docview.app/Contents/Info.plist + + + echo -n "APPL????" >docview.app/Contents/PkgInfo + + + ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc docview.app/Contents/Resources/docview.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns docview.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@docview_bundle: docview.app/Contents docview_doc.o: $(srcdir)/doc.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< @@ -150,7 +176,7 @@ docview_docview.o: $(srcdir)/docview.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< docview_docview_rc.o: $(srcdir)/docview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples docview_view.o: $(srcdir)/view.cpp $(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $< @@ -165,4 +191,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean docview_bundle install uninstall diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index 54e38fd916..4a468106df 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DRAGIMAG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DRAGIMAG_OBJECTS = \ dragimag_dragimag.o \ $(__dragimag___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o dragimag$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dragimag$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,15 +123,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__dragimag___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C dragimag$(EXEEXT) @COND_PLATFORM_WIN32_1@__dragimag___win32rc = dragimag_dragimag_rc.o +@COND_PLATFORM_MACOSX_1@__dragimag_bundle___depname = dragimag_bundle ### Targets: ### -all: dragimag$(EXEEXT) data +all: dragimag$(EXEEXT) $(__dragimag_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dragimag$(EXEEXT) + rm -rf dragimag.app data: @mkdir -p . @@ -141,19 +144,42 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dragimag$(EXEEXT): $(DRAGIMAG_OBJECTS) $(__dragimag___win32rc) $(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dragimag___mac_rezcmd) $(__dragimag___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dragimag.app/Contents: dragimag$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dragimag.app/Contents + mkdir -p dragimag.app/Contents/MacOS + mkdir -p dragimag.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dragimag/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dragimag.app/Contents/Info.plist + + + echo -n "APPL????" >dragimag.app/Contents/PkgInfo + + + ln -f dragimag$(EXEEXT) dragimag.app/Contents/MacOS/dragimag + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dragimag.app/Contents/Resources/dragimag.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dragimag.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@dragimag_bundle: dragimag.app/Contents dragimag_dragimag.o: $(srcdir)/dragimag.cpp $(CXXC) -c -o $@ $(DRAGIMAG_CXXFLAGS) $< dragimag_dragimag_rc.o: $(srcdir)/dragimag.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -165,4 +191,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean dragimag_bundle install uninstall diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 27dc7d4886..899b93c84f 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DRAWING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DRAWING_OBJECTS = \ drawing_drawing.o \ $(__drawing___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o drawing$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o drawing$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,15 +123,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__drawing___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C drawing$(EXEEXT) @COND_PLATFORM_WIN32_1@__drawing___win32rc = drawing_drawing_rc.o +@COND_PLATFORM_MACOSX_1@__drawing_bundle___depname = drawing_bundle ### Targets: ### -all: drawing$(EXEEXT) data +all: drawing$(EXEEXT) $(__drawing_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f drawing$(EXEEXT) + rm -rf drawing.app data: @mkdir -p . @@ -141,19 +144,42 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile drawing$(EXEEXT): $(DRAWING_OBJECTS) $(__drawing___win32rc) $(CXX) -o $@ $(DRAWING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__drawing___mac_rezcmd) $(__drawing___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +drawing.app/Contents: drawing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p drawing.app/Contents + mkdir -p drawing.app/Contents/MacOS + mkdir -p drawing.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/drawing/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >drawing.app/Contents/Info.plist + + + echo -n "APPL????" >drawing.app/Contents/PkgInfo + + + ln -f drawing$(EXEEXT) drawing.app/Contents/MacOS/drawing + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc drawing.app/Contents/Resources/drawing.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns drawing.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@drawing_bundle: drawing.app/Contents drawing_drawing.o: $(srcdir)/drawing.cpp $(CXXC) -c -o $@ $(DRAWING_CXXFLAGS) $< drawing_drawing_rc.o: $(srcdir)/drawing.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -165,4 +191,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean drawing_bundle install uninstall diff --git a/samples/dynamic/Makefile.in b/samples/dynamic/Makefile.in index 750d7f0ba5..169650bebf 100644 --- a/samples/dynamic/Makefile.in +++ b/samples/dynamic/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ DYNAMIC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) DYNAMIC_OBJECTS = \ dynamic_dynamic.o \ $(__dynamic___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o dynamic$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dynamic$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__dynamic___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C dynamic$(EXEEXT) @COND_PLATFORM_WIN32_1@__dynamic___win32rc = dynamic_dynamic_rc.o +@COND_PLATFORM_MACOSX_1@__dynamic_bundle___depname = dynamic_bundle ### Targets: ### -all: dynamic$(EXEEXT) +all: dynamic$(EXEEXT) $(__dynamic_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f dynamic$(EXEEXT) + rm -rf dynamic.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile dynamic$(EXEEXT): $(DYNAMIC_OBJECTS) $(__dynamic___win32rc) $(CXX) -o $@ $(DYNAMIC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__dynamic___mac_rezcmd) $(__dynamic___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +dynamic.app/Contents: dynamic$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p dynamic.app/Contents + mkdir -p dynamic.app/Contents/MacOS + mkdir -p dynamic.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/dynamic/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >dynamic.app/Contents/Info.plist + + + echo -n "APPL????" >dynamic.app/Contents/PkgInfo + + + ln -f dynamic$(EXEEXT) dynamic.app/Contents/MacOS/dynamic + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dynamic.app/Contents/Resources/dynamic.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns dynamic.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@dynamic_bundle: dynamic.app/Contents dynamic_dynamic.o: $(srcdir)/dynamic.cpp $(CXXC) -c -o $@ $(DYNAMIC_CXXFLAGS) $< dynamic_dynamic_rc.o: $(srcdir)/dynamic.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean dynamic_bundle install uninstall diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index fb28d37e15..c1f17f86e8 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ ERASE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) ERASE_OBJECTS = \ erase_erase.o \ $(__erase___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o erase$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o erase$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__erase___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C erase$(EXEEXT) @COND_PLATFORM_WIN32_1@__erase___win32rc = erase_erase_rc.o +@COND_PLATFORM_MACOSX_1@__erase_bundle___depname = erase_bundle ### Targets: ### -all: erase$(EXEEXT) +all: erase$(EXEEXT) $(__erase_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f erase$(EXEEXT) + rm -rf erase.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile erase$(EXEEXT): $(ERASE_OBJECTS) $(__erase___win32rc) $(CXX) -o $@ $(ERASE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__erase___mac_rezcmd) $(__erase___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +erase.app/Contents: erase$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p erase.app/Contents + mkdir -p erase.app/Contents/MacOS + mkdir -p erase.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/erase/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >erase.app/Contents/Info.plist + + + echo -n "APPL????" >erase.app/Contents/PkgInfo + + + ln -f erase$(EXEEXT) erase.app/Contents/MacOS/erase + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc erase.app/Contents/Resources/erase.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns erase.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@erase_bundle: erase.app/Contents erase_erase.o: $(srcdir)/erase.cpp $(CXXC) -c -o $@ $(ERASE_CXXFLAGS) $< erase_erase_rc.o: $(srcdir)/erase.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean erase_bundle install uninstall diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 60d3c6f557..66fc4f1e44 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ EVENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) EVENT_OBJECTS = \ event_event.o \ $(__event___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o event$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o event$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__event___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C event$(EXEEXT) @COND_PLATFORM_WIN32_1@__event___win32rc = event_event_rc.o +@COND_PLATFORM_MACOSX_1@__event_bundle___depname = event_bundle ### Targets: ### -all: event$(EXEEXT) +all: event$(EXEEXT) $(__event_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f event$(EXEEXT) + rm -rf event.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile event$(EXEEXT): $(EVENT_OBJECTS) $(__event___win32rc) $(CXX) -o $@ $(EVENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__event___mac_rezcmd) $(__event___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +event.app/Contents: event$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p event.app/Contents + mkdir -p event.app/Contents/MacOS + mkdir -p event.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/event/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >event.app/Contents/Info.plist + + + echo -n "APPL????" >event.app/Contents/PkgInfo + + + ln -f event$(EXEEXT) event.app/Contents/MacOS/event + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc event.app/Contents/Resources/event.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns event.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@event_bundle: event.app/Contents event_event.o: $(srcdir)/event.cpp $(CXXC) -c -o $@ $(EVENT_CXXFLAGS) $< event_event_rc.o: $(srcdir)/event.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean event_bundle install uninstall diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 1b12846653..ef0e2a797a 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ EXEC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) EXEC_OBJECTS = \ exec_exec.o \ $(__exec___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o exec$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o exec$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__exec___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C exec$(EXEEXT) @COND_PLATFORM_WIN32_1@__exec___win32rc = exec_exec_rc.o +@COND_PLATFORM_MACOSX_1@__exec_bundle___depname = exec_bundle ### Targets: ### -all: exec$(EXEEXT) +all: exec$(EXEEXT) $(__exec_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f exec$(EXEEXT) + rm -rf exec.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile exec$(EXEEXT): $(EXEC_OBJECTS) $(__exec___win32rc) $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__exec___mac_rezcmd) $(__exec___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +exec.app/Contents: exec$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p exec.app/Contents + mkdir -p exec.app/Contents/MacOS + mkdir -p exec.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/exec/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >exec.app/Contents/Info.plist + + + echo -n "APPL????" >exec.app/Contents/PkgInfo + + + ln -f exec$(EXEEXT) exec.app/Contents/MacOS/exec + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc exec.app/Contents/Resources/exec.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns exec.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@exec_bundle: exec.app/Contents exec_exec.o: $(srcdir)/exec.cpp $(CXXC) -c -o $@ $(EXEC_CXXFLAGS) $< exec_exec_rc.o: $(srcdir)/exec.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean exec_bundle install uninstall diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index 405bed3c45..b62be3eb07 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ FONT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) FONT_OBJECTS = \ font_font.o \ $(__font___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o font$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o font$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__font___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C font$(EXEEXT) @COND_PLATFORM_WIN32_1@__font___win32rc = font_font_rc.o +@COND_PLATFORM_MACOSX_1@__font_bundle___depname = font_bundle ### Targets: ### -all: font$(EXEEXT) +all: font$(EXEEXT) $(__font_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f font$(EXEEXT) + rm -rf font.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile font$(EXEEXT): $(FONT_OBJECTS) $(__font___win32rc) $(CXX) -o $@ $(FONT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__font___mac_rezcmd) $(__font___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +font.app/Contents: font$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p font.app/Contents + mkdir -p font.app/Contents/MacOS + mkdir -p font.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/font/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >font.app/Contents/Info.plist + + + echo -n "APPL????" >font.app/Contents/PkgInfo + + + ln -f font$(EXEEXT) font.app/Contents/MacOS/font + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc font.app/Contents/Resources/font.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns font.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@font_bundle: font.app/Contents font_font.o: $(srcdir)/font.cpp $(CXXC) -c -o $@ $(FONT_CXXFLAGS) $< font_font_rc.o: $(srcdir)/font.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean font_bundle install uninstall diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index b2c760eca5..c7b8804cc7 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ GRID_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) GRID_OBJECTS = \ grid_griddemo.o \ $(__grid___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o grid$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o grid$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -125,30 +126,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__grid___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C grid$(EXEEXT) @COND_PLATFORM_WIN32_1@__grid___win32rc = grid_griddemo_rc.o +@COND_PLATFORM_MACOSX_1@__grid_bundle___depname = grid_bundle ### Targets: ### -all: grid$(EXEEXT) +all: grid$(EXEEXT) $(__grid_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f grid$(EXEEXT) + rm -rf grid.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile grid$(EXEEXT): $(GRID_OBJECTS) $(__grid___win32rc) $(CXX) -o $@ $(GRID_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__grid___mac_rezcmd) $(__grid___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +grid.app/Contents: grid$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p grid.app/Contents + mkdir -p grid.app/Contents/MacOS + mkdir -p grid.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/grid/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >grid.app/Contents/Info.plist + + + echo -n "APPL????" >grid.app/Contents/PkgInfo + + + ln -f grid$(EXEEXT) grid.app/Contents/MacOS/grid + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc grid.app/Contents/Resources/grid.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns grid.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@grid_bundle: grid.app/Contents grid_griddemo.o: $(srcdir)/griddemo.cpp $(CXXC) -c -o $@ $(GRID_CXXFLAGS) $< grid_griddemo_rc.o: $(srcdir)/griddemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -160,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean grid_bundle install uninstall diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index da7cd3442f..c69bce4b74 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) HELP_OBJECTS = \ help_demo.o \ $(__help___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o help$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o help$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,30 +126,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT) @COND_PLATFORM_WIN32_1@__help___win32rc = help_demo_rc.o +@COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle ### Targets: ### -all: help$(EXEEXT) +all: help$(EXEEXT) $(__help_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f help$(EXEEXT) + rm -rf help.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p help.app/Contents + mkdir -p help.app/Contents/MacOS + mkdir -p help.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/help/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >help.app/Contents/Info.plist + + + echo -n "APPL????" >help.app/Contents/PkgInfo + + + ln -f help$(EXEEXT) help.app/Contents/MacOS/help + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns help.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@help_bundle: help.app/Contents help_demo.o: $(srcdir)/demo.cpp $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< help_demo_rc.o: $(srcdir)/demo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -160,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean help_bundle install uninstall diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index c28368316e..211c1c25fb 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ HTLBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) HTLBOX_OBJECTS = \ htlbox_htlbox.o \ $(__htlbox___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o htlbox$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o htlbox$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,30 +126,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__htlbox___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C htlbox$(EXEEXT) @COND_PLATFORM_WIN32_1@__htlbox___win32rc = htlbox_htlbox_rc.o +@COND_PLATFORM_MACOSX_1@__htlbox_bundle___depname = htlbox_bundle ### Targets: ### -all: htlbox$(EXEEXT) +all: htlbox$(EXEEXT) $(__htlbox_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f htlbox$(EXEEXT) + rm -rf htlbox.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc) $(CXX) -o $@ $(HTLBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__htlbox___mac_rezcmd) $(__htlbox___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +htlbox.app/Contents: htlbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p htlbox.app/Contents + mkdir -p htlbox.app/Contents/MacOS + mkdir -p htlbox.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/htlbox/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >htlbox.app/Contents/Info.plist + + + echo -n "APPL????" >htlbox.app/Contents/PkgInfo + + + ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc htlbox.app/Contents/Resources/htlbox.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@htlbox_bundle: htlbox.app/Contents htlbox_htlbox.o: $(srcdir)/htlbox.cpp $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $< htlbox_htlbox_rc.o: $(srcdir)/htlbox.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -160,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean htlbox_bundle install uninstall diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in index d789cca246..1af33adbfc 100644 --- a/samples/html/Makefile.in +++ b/samples/html/Makefile.in @@ -25,7 +25,7 @@ about: (cd about && $(MAKE) all) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o (cd about && $(MAKE) clean) (cd help && $(MAKE) clean) @@ -37,8 +37,7 @@ clean: (cd zip && $(MAKE) clean) distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile help: (cd help && $(MAKE) all) @@ -47,24 +46,8 @@ helpview: (cd helpview && $(MAKE) all) install: all - (cd about && $(MAKE) install) - (cd help && $(MAKE) install) - (cd helpview && $(MAKE) install) - (cd printing && $(MAKE) install) - (cd test && $(MAKE) install) - (cd virtual && $(MAKE) install) - (cd widget && $(MAKE) install) - (cd zip && $(MAKE) install) install-strip: install - (cd about && $(MAKE) install-strip) - (cd help && $(MAKE) install-strip) - (cd helpview && $(MAKE) install-strip) - (cd printing && $(MAKE) install-strip) - (cd test && $(MAKE) install-strip) - (cd virtual && $(MAKE) install-strip) - (cd widget && $(MAKE) install-strip) - (cd zip && $(MAKE) install-strip) printing: (cd printing && $(MAKE) all) diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index c9bfd5f6e1..9a00158fc6 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ ABOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) ABOUT_OBJECTS = \ about_about.o \ $(__about___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o about$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o about$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,26 +126,52 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__about___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C about$(EXEEXT) @COND_PLATFORM_WIN32_1@__about___win32rc = about_about_rc.o +@COND_PLATFORM_MACOSX_1@__about_bundle___depname = about_bundle ### Targets: ### -all: about$(EXEEXT) data +all: about$(EXEEXT) $(__about_bundle___depname) data about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc) $(CXX) -o $@ $(ABOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__about___mac_rezcmd) $(__about___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +about.app/Contents: about$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p about.app/Contents + mkdir -p about.app/Contents/MacOS + mkdir -p about.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/about/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >about.app/Contents/Info.plist + + + echo -n "APPL????" >about.app/Contents/PkgInfo + + + ln -f about$(EXEEXT) about.app/Contents/MacOS/about + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc about.app/Contents/Resources/about.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns about.app/Contents/Resources/wxmac.icns about_about.o: $(srcdir)/about.cpp $(CXXC) -c -o $@ $(ABOUT_CXXFLAGS) $< about_about_rc.o: $(srcdir)/about.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples + +@COND_PLATFORM_MACOSX_1@about_bundle: about.app/Contents clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f about$(EXEEXT) + rm -rf about.app data: @mkdir -p ./data @@ -155,8 +182,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -168,4 +194,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all about_bundle clean data distclean install uninstall diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index 148a66323c..94b1001c7a 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ HELP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) HELP_OBJECTS = \ help_help.o \ $(__help___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o help$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o help$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT) @COND_PLATFORM_WIN32_1@__help___win32rc = help_help_rc.o +@COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle ### Targets: ### -all: help$(EXEEXT) data +all: help$(EXEEXT) $(__help_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f help$(EXEEXT) + rm -rf help.app data: @mkdir -p ./helpfiles @@ -144,19 +147,42 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc) $(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__help___mac_rezcmd) $(__help___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +help.app/Contents: help$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p help.app/Contents + mkdir -p help.app/Contents/MacOS + mkdir -p help.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/help/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >help.app/Contents/Info.plist + + + echo -n "APPL????" >help.app/Contents/PkgInfo + + + ln -f help$(EXEEXT) help.app/Contents/MacOS/help + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc help.app/Contents/Resources/help.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns help.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@help_bundle: help.app/Contents help_help.o: $(srcdir)/help.cpp $(CXXC) -c -o $@ $(HELP_CXXFLAGS) $< help_help_rc.o: $(srcdir)/help.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples install: all @@ -168,4 +194,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean help_bundle install uninstall diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index a90a2d3dd1..ccccf647d4 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ HELPVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) HELPVIEW_OBJECTS = \ helpview_helpview.o \ $(__helpview___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o helpview$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o helpview$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__helpview___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C helpview$(EXEEXT) @COND_PLATFORM_WIN32_1@__helpview___win32rc = helpview_helpview_rc.o +@COND_PLATFORM_MACOSX_1@__helpview_bundle___depname = helpview_bundle ### Targets: ### -all: helpview$(EXEEXT) data +all: helpview$(EXEEXT) $(__helpview_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f helpview$(EXEEXT) + rm -rf helpview.app data: @mkdir -p . @@ -144,19 +147,42 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc) $(CXX) -o $@ $(HELPVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__helpview___mac_rezcmd) $(__helpview___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +helpview.app/Contents: helpview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p helpview.app/Contents + mkdir -p helpview.app/Contents/MacOS + mkdir -p helpview.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/helpview/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >helpview.app/Contents/Info.plist + + + echo -n "APPL????" >helpview.app/Contents/PkgInfo + + + ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc helpview.app/Contents/Resources/helpview.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns helpview.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@helpview_bundle: helpview.app/Contents helpview_helpview.o: $(srcdir)/helpview.cpp $(CXXC) -c -o $@ $(HELPVIEW_CXXFLAGS) $< helpview_helpview_rc.o: $(srcdir)/helpview.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples install: all @@ -168,4 +194,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean helpview_bundle install uninstall diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index b47d5803cd..c36fd62771 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) PRINTING_OBJECTS = \ printing_printing.o \ $(__printing___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o printing$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o printing$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT) @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o +@COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle ### Targets: ### -all: printing$(EXEEXT) data +all: printing$(EXEEXT) $(__printing_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f printing$(EXEEXT) + rm -rf printing.app data: @mkdir -p . @@ -144,8 +147,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -155,12 +157,36 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p printing.app/Contents + mkdir -p printing.app/Contents/MacOS + mkdir -p printing.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/printing/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >printing.app/Contents/Info.plist + + + echo -n "APPL????" >printing.app/Contents/PkgInfo + + + ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc printing.app/Contents/Resources/printing.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns printing.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@printing_bundle: printing.app/Contents printing_printing.o: $(srcdir)/printing.cpp $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $< printing_printing_rc.o: $(srcdir)/printing.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples uninstall: @@ -168,4 +194,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install printing_bundle uninstall diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 322cdb46f1..2deadec5f1 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) TEST_OBJECTS = \ test_test.o \ $(__test___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o test$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o test$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -127,15 +128,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C test$(EXEEXT) @COND_PLATFORM_WIN32_1@__test___win32rc = test_test_rc.o +@COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle ### Targets: ### -all: test$(EXEEXT) data +all: test$(EXEEXT) $(__test_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f test$(EXEEXT) + rm -rf test.app data: @mkdir -p . @@ -146,8 +149,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,12 +159,36 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc) $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__test___mac_rezcmd) $(__test___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +test.app/Contents: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p test.app/Contents + mkdir -p test.app/Contents/MacOS + mkdir -p test.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/test/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >test.app/Contents/Info.plist + + + echo -n "APPL????" >test.app/Contents/PkgInfo + + + ln -f test$(EXEEXT) test.app/Contents/MacOS/test + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc test.app/Contents/Resources/test.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns test.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@test_bundle: test.app/Contents test_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< test_test_rc.o: $(srcdir)/test.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples uninstall: @@ -170,4 +196,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install test_bundle uninstall diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 6899440127..a00e10b368 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) VIRTUAL_OBJECTS = \ virtual_virtual.o \ $(__virtual___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o virtual$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o virtual$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C virtual$(EXEEXT) @COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_virtual_rc.o +@COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle ### Targets: ### -all: virtual$(EXEEXT) data +all: virtual$(EXEEXT) $(__virtual_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f virtual$(EXEEXT) + rm -rf virtual.app data: @mkdir -p . @@ -144,8 +147,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,15 +159,39 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) $(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__virtual___mac_rezcmd) $(__virtual___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +virtual.app/Contents: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p virtual.app/Contents + mkdir -p virtual.app/Contents/MacOS + mkdir -p virtual.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/virtual/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >virtual.app/Contents/Info.plist + + + echo -n "APPL????" >virtual.app/Contents/PkgInfo + + + ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc virtual.app/Contents/Resources/virtual.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns virtual.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@virtual_bundle: virtual.app/Contents virtual_virtual.o: $(srcdir)/virtual.cpp $(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $< virtual_virtual_rc.o: $(srcdir)/virtual.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install uninstall virtual_bundle diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 356ff9cf59..733be81564 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib WIDGET_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) WIDGET_OBJECTS = \ widget_widget.o \ $(__widget___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o widget$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o widget$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__widget___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C widget$(EXEEXT) @COND_PLATFORM_WIN32_1@__widget___win32rc = widget_widget_rc.o +@COND_PLATFORM_MACOSX_1@__widget_bundle___depname = widget_bundle ### Targets: ### -all: widget$(EXEEXT) data +all: widget$(EXEEXT) $(__widget_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f widget$(EXEEXT) + rm -rf widget.app data: @mkdir -p . @@ -144,8 +147,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,15 +159,39 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc) $(CXX) -o $@ $(WIDGET_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__widget___mac_rezcmd) $(__widget___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +widget.app/Contents: widget$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p widget.app/Contents + mkdir -p widget.app/Contents/MacOS + mkdir -p widget.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/widget/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >widget.app/Contents/Info.plist + + + echo -n "APPL????" >widget.app/Contents/PkgInfo + + + ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widget.app/Contents/Resources/widget.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns widget.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@widget_bundle: widget.app/Contents widget_widget.o: $(srcdir)/widget.cpp $(CXXC) -c -o $@ $(WIDGET_CXXFLAGS) $< widget_widget_rc.o: $(srcdir)/widget.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install uninstall widget_bundle diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 6caaa8ad19..d34337e282 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib ZIP_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) ZIP_OBJECTS = \ zip_zip.o \ $(__zip___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o zip$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o zip$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,15 +125,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__zip___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__zip___mac_setfilecmd = $(SETFILE) -a C zip$(EXEEXT) @COND_PLATFORM_WIN32_1@__zip___win32rc = zip_zip_rc.o +@COND_PLATFORM_MACOSX_1@__zip_bundle___depname = zip_bundle ### Targets: ### -all: zip$(EXEEXT) data +all: zip$(EXEEXT) $(__zip_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f zip$(EXEEXT) + rm -rf zip.app data: @mkdir -p . @@ -143,8 +146,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -156,15 +158,39 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc) $(CXX) -o $@ $(ZIP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__zip___mac_rezcmd) $(__zip___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +zip.app/Contents: zip$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p zip.app/Contents + mkdir -p zip.app/Contents/MacOS + mkdir -p zip.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/zip/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >zip.app/Contents/Info.plist + + + echo -n "APPL????" >zip.app/Contents/PkgInfo + + + ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc zip.app/Contents/Resources/zip.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns zip.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@zip_bundle: zip.app/Contents zip_zip.o: $(srcdir)/zip.cpp $(CXXC) -c -o $@ $(ZIP_CXXFLAGS) $< zip_zip_rc.o: $(srcdir)/zip.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install uninstall zip_bundle diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index 512ad861af..4e2c60b336 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) IMAGE_OBJECTS = \ image_image.o \ $(__image___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o image$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o image$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,15 +123,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__image___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C image$(EXEEXT) @COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o +@COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle ### Targets: ### -all: image$(EXEEXT) data +all: image$(EXEEXT) $(__image_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f image$(EXEEXT) + rm -rf image.app data: @mkdir -p . @@ -141,19 +144,42 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc) $(CXX) -o $@ $(IMAGE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__image___mac_rezcmd) $(__image___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +image.app/Contents: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p image.app/Contents + mkdir -p image.app/Contents/MacOS + mkdir -p image.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/image/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >image.app/Contents/Info.plist + + + echo -n "APPL????" >image.app/Contents/PkgInfo + + + ln -f image$(EXEEXT) image.app/Contents/MacOS/image + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc image.app/Contents/Resources/image.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns image.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@image_bundle: image.app/Contents image_image.o: $(srcdir)/image.cpp $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $< image_image_rc.o: $(srcdir)/image.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples install: all @@ -165,4 +191,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean image_bundle install uninstall diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 7c9e5f210f..6a040e9a0e 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ INTERNAT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) INTERNAT_OBJECTS = \ internat_internat.o \ $(__internat___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o internat$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o internat$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C internat$(EXEEXT) @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_internat_rc.o +@COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle ### Targets: ### -all: internat$(EXEEXT) +all: internat$(EXEEXT) $(__internat_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f internat$(EXEEXT) + rm -rf internat.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc) $(CXX) -o $@ $(INTERNAT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__internat___mac_rezcmd) $(__internat___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +internat.app/Contents: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p internat.app/Contents + mkdir -p internat.app/Contents/MacOS + mkdir -p internat.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/internat/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >internat.app/Contents/Info.plist + + + echo -n "APPL????" >internat.app/Contents/PkgInfo + + + ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc internat.app/Contents/Resources/internat.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns internat.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@internat_bundle: internat.app/Contents internat_internat.o: $(srcdir)/internat.cpp $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $< internat_internat_rc.o: $(srcdir)/internat.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install internat_bundle uninstall diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 658270a5af..b13fb93674 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CLIENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) CLIENT_OBJECTS = \ $(__client___win32rc) \ client_client.o @@ -43,7 +44,7 @@ LIBDIRNAME = $(top_builddir)lib SERVER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) SERVER_OBJECTS = \ $(__server___win32rc) \ server_server.o @@ -111,15 +112,15 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \ $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \ $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \ - $(__DLLFLAG_p_6) -i ../../samples -o client$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \ $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \ $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \ - $(__DLLFLAG_p_6) -i ../../samples -o server$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -138,35 +139,62 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT) @COND_PLATFORM_WIN32_1@__client___win32rc = client_sample_rc.o +@COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) @COND_PLATFORM_WIN32_1@__server___win32rc = server_sample_rc.o +@COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle ### Targets: ### -all: client$(EXEEXT) server$(EXEEXT) +all: client$(EXEEXT) $(__client_bundle___depname) server$(EXEEXT) $(__server_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f client$(EXEEXT) + rm -rf client.app rm -f server$(EXEEXT) + rm -rf server.app client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__client___mac_rezcmd) $(__client___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p client.app/Contents + mkdir -p client.app/Contents/MacOS + mkdir -p client.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/client/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >client.app/Contents/Info.plist + + + echo -n "APPL????" >client.app/Contents/PkgInfo + + + ln -f client$(EXEEXT) client.app/Contents/MacOS/client + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents client_client.o: $(srcdir)/client.cpp $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $< client_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -176,9 +204,33 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__server___mac_rezcmd) $(__server___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p server.app/Contents + mkdir -p server.app/Contents/MacOS + mkdir -p server.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/server/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >server.app/Contents/Info.plist + + + echo -n "APPL????" >server.app/Contents/PkgInfo + + + ln -f server$(EXEEXT) server.app/Contents/MacOS/server + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents server_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples server_server.o: $(srcdir)/server.cpp $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $< @@ -189,4 +241,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean client_bundle distclean install server_bundle uninstall diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index d35096b140..c6a8227875 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ JOYTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) JOYTEST_OBJECTS = \ joytest_joytest.o \ $(__joytest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o joytest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o joytest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -125,19 +126,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__joytest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C joytest$(EXEEXT) @COND_PLATFORM_WIN32_1@__joytest___win32rc = joytest_joytest_rc.o +@COND_PLATFORM_MACOSX_1@__joytest_bundle___depname = joytest_bundle ### Targets: ### -all: joytest$(EXEEXT) +all: joytest$(EXEEXT) $(__joytest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f joytest$(EXEEXT) + rm -rf joytest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -147,12 +149,36 @@ joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__joytest___mac_rezcmd) $(__joytest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +joytest.app/Contents: joytest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p joytest.app/Contents + mkdir -p joytest.app/Contents/MacOS + mkdir -p joytest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/joytest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >joytest.app/Contents/Info.plist + + + echo -n "APPL????" >joytest.app/Contents/PkgInfo + + + ln -f joytest$(EXEEXT) joytest.app/Contents/MacOS/joytest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc joytest.app/Contents/Resources/joytest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns joytest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@joytest_bundle: joytest.app/Contents joytest_joytest.o: $(srcdir)/joytest.cpp $(CXXC) -c -o $@ $(JOYTEST_CXXFLAGS) $< joytest_joytest_rc.o: $(srcdir)/joytest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -160,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install joytest_bundle uninstall diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 9d29c64b8c..00001c1f11 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ KEYBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) KEYBOARD_OBJECTS = \ keyboard_keyboard.o \ $(__keyboard___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o keyboard$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o keyboard$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__keyboard___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C keyboard$(EXEEXT) @COND_PLATFORM_WIN32_1@__keyboard___win32rc = keyboard_keyboard_rc.o +@COND_PLATFORM_MACOSX_1@__keyboard_bundle___depname = keyboard_bundle ### Targets: ### -all: keyboard$(EXEEXT) +all: keyboard$(EXEEXT) $(__keyboard_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f keyboard$(EXEEXT) + rm -rf keyboard.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ keyboard$(EXEEXT): $(KEYBOARD_OBJECTS) $(__keyboard___win32rc) $(CXX) -o $@ $(KEYBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__keyboard___mac_rezcmd) $(__keyboard___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +keyboard.app/Contents: keyboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p keyboard.app/Contents + mkdir -p keyboard.app/Contents/MacOS + mkdir -p keyboard.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/keyboard/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >keyboard.app/Contents/Info.plist + + + echo -n "APPL????" >keyboard.app/Contents/PkgInfo + + + ln -f keyboard$(EXEEXT) keyboard.app/Contents/MacOS/keyboard + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc keyboard.app/Contents/Resources/keyboard.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns keyboard.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@keyboard_bundle: keyboard.app/Contents keyboard_keyboard.o: $(srcdir)/keyboard.cpp $(CXXC) -c -o $@ $(KEYBOARD_CXXFLAGS) $< keyboard_keyboard_rc.o: $(srcdir)/keyboard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install keyboard_bundle uninstall diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index 2ea2f1ffb3..d05e39bf59 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ LAYOUT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) LAYOUT_OBJECTS = \ layout_layout.o \ $(__layout___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o layout$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o layout$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__layout___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C layout$(EXEEXT) @COND_PLATFORM_WIN32_1@__layout___win32rc = layout_layout_rc.o +@COND_PLATFORM_MACOSX_1@__layout_bundle___depname = layout_bundle ### Targets: ### -all: layout$(EXEEXT) +all: layout$(EXEEXT) $(__layout_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f layout$(EXEEXT) + rm -rf layout.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc) $(CXX) -o $@ $(LAYOUT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__layout___mac_rezcmd) $(__layout___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +layout.app/Contents: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p layout.app/Contents + mkdir -p layout.app/Contents/MacOS + mkdir -p layout.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/layout/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >layout.app/Contents/Info.plist + + + echo -n "APPL????" >layout.app/Contents/PkgInfo + + + ln -f layout$(EXEEXT) layout.app/Contents/MacOS/layout + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc layout.app/Contents/Resources/layout.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns layout.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@layout_bundle: layout.app/Contents layout_layout.o: $(srcdir)/layout.cpp $(CXXC) -c -o $@ $(LAYOUT_CXXFLAGS) $< layout_layout_rc.o: $(srcdir)/layout.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install layout_bundle uninstall diff --git a/samples/listbox/Makefile.in b/samples/listbox/Makefile.in index 33f4024b0d..04b1172495 100644 --- a/samples/listbox/Makefile.in +++ b/samples/listbox/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib LISTBOX_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) LISTBOX_OBJECTS = \ $(__listbox___win32rc) \ listbox_lboxtest.o @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o listbox$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o listbox$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__listbox___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C listbox$(EXEEXT) @COND_PLATFORM_WIN32_1@__listbox___win32rc = listbox_sample_rc.o +@COND_PLATFORM_MACOSX_1@__listbox_bundle___depname = listbox_bundle ### Targets: ### -all: listbox$(EXEEXT) +all: listbox$(EXEEXT) $(__listbox_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f listbox$(EXEEXT) + rm -rf listbox.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ listbox$(EXEEXT): $(LISTBOX_OBJECTS) $(__listbox___win32rc) $(CXX) -o $@ $(LISTBOX_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__listbox___mac_rezcmd) $(__listbox___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +listbox.app/Contents: listbox$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p listbox.app/Contents + mkdir -p listbox.app/Contents/MacOS + mkdir -p listbox.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/listbox/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >listbox.app/Contents/Info.plist + + + echo -n "APPL????" >listbox.app/Contents/PkgInfo + + + ln -f listbox$(EXEEXT) listbox.app/Contents/MacOS/listbox + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc listbox.app/Contents/Resources/listbox.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns listbox.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@listbox_bundle: listbox.app/Contents listbox_lboxtest.o: $(srcdir)/lboxtest.cpp $(CXXC) -c -o $@ $(LISTBOX_CXXFLAGS) $< listbox_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install listbox_bundle uninstall diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index 580ae59b5f..c5f6920a3f 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib LISTCTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) LISTCTRL_OBJECTS = \ listctrl_listtest.o \ $(__listctrl___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o listctrl$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o listctrl$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__listctrl___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C listctrl$(EXEEXT) @COND_PLATFORM_WIN32_1@__listctrl___win32rc = listctrl_listtest_rc.o +@COND_PLATFORM_MACOSX_1@__listctrl_bundle___depname = listctrl_bundle ### Targets: ### -all: listctrl$(EXEEXT) +all: listctrl$(EXEEXT) $(__listctrl_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f listctrl$(EXEEXT) + rm -rf listctrl.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ listctrl$(EXEEXT): $(LISTCTRL_OBJECTS) $(__listctrl___win32rc) $(CXX) -o $@ $(LISTCTRL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__listctrl___mac_rezcmd) $(__listctrl___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +listctrl.app/Contents: listctrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p listctrl.app/Contents + mkdir -p listctrl.app/Contents/MacOS + mkdir -p listctrl.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/listctrl/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >listctrl.app/Contents/Info.plist + + + echo -n "APPL????" >listctrl.app/Contents/PkgInfo + + + ln -f listctrl$(EXEEXT) listctrl.app/Contents/MacOS/listctrl + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc listctrl.app/Contents/Resources/listctrl.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns listctrl.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@listctrl_bundle: listctrl.app/Contents listctrl_listtest.o: $(srcdir)/listtest.cpp $(CXXC) -c -o $@ $(LISTCTRL_CXXFLAGS) $< listctrl_listtest_rc.o: $(srcdir)/listtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install listctrl_bundle uninstall diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 4833051e83..eef9e783fa 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib MDI_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) MDI_OBJECTS = \ mdi_mdi.o \ $(__mdi___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o mdi$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o mdi$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -121,19 +122,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__mdi___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__mdi___mac_setfilecmd = $(SETFILE) -a C mdi$(EXEEXT) @COND_PLATFORM_WIN32_1@__mdi___win32rc = mdi_mdi_rc.o +@COND_PLATFORM_MACOSX_1@__mdi_bundle___depname = mdi_bundle ### Targets: ### -all: mdi$(EXEEXT) +all: mdi$(EXEEXT) $(__mdi_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f mdi$(EXEEXT) + rm -rf mdi.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -143,12 +145,36 @@ mdi$(EXEEXT): $(MDI_OBJECTS) $(__mdi___win32rc) $(CXX) -o $@ $(MDI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__mdi___mac_rezcmd) $(__mdi___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +mdi.app/Contents: mdi$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p mdi.app/Contents + mkdir -p mdi.app/Contents/MacOS + mkdir -p mdi.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/mdi/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >mdi.app/Contents/Info.plist + + + echo -n "APPL????" >mdi.app/Contents/PkgInfo + + + ln -f mdi$(EXEEXT) mdi.app/Contents/MacOS/mdi + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mdi.app/Contents/Resources/mdi.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns mdi.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@mdi_bundle: mdi.app/Contents mdi_mdi.o: $(srcdir)/mdi.cpp $(CXXC) -c -o $@ $(MDI_CXXFLAGS) $< mdi_mdi_rc.o: $(srcdir)/mdi.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -156,4 +182,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install mdi_bundle uninstall diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index 385c041ca1..bf6cb75641 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib MEMCHECK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) MEMCHECK_OBJECTS = \ memcheck_memcheck.o \ $(__memcheck___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o memcheck$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o memcheck$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__memcheck___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C memcheck$(EXEEXT) @COND_PLATFORM_WIN32_1@__memcheck___win32rc = memcheck_memcheck_rc.o +@COND_PLATFORM_MACOSX_1@__memcheck_bundle___depname = memcheck_bundle ### Targets: ### -all: memcheck$(EXEEXT) +all: memcheck$(EXEEXT) $(__memcheck_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f memcheck$(EXEEXT) + rm -rf memcheck.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ memcheck$(EXEEXT): $(MEMCHECK_OBJECTS) $(__memcheck___win32rc) $(CXX) -o $@ $(MEMCHECK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__memcheck___mac_rezcmd) $(__memcheck___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +memcheck.app/Contents: memcheck$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p memcheck.app/Contents + mkdir -p memcheck.app/Contents/MacOS + mkdir -p memcheck.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/memcheck/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >memcheck.app/Contents/Info.plist + + + echo -n "APPL????" >memcheck.app/Contents/PkgInfo + + + ln -f memcheck$(EXEEXT) memcheck.app/Contents/MacOS/memcheck + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc memcheck.app/Contents/Resources/memcheck.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns memcheck.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@memcheck_bundle: memcheck.app/Contents memcheck_memcheck.o: $(srcdir)/memcheck.cpp $(CXXC) -c -o $@ $(MEMCHECK_CXXFLAGS) $< memcheck_memcheck_rc.o: $(srcdir)/memcheck.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install memcheck_bundle uninstall diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index acf3cd5186..1bd70c4efa 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib MENU_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) MENU_OBJECTS = \ menu_menu.o \ $(__menu___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o menu$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o menu$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__menu___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C menu$(EXEEXT) @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_menu_rc.o +@COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle ### Targets: ### -all: menu$(EXEEXT) +all: menu$(EXEEXT) $(__menu_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f menu$(EXEEXT) + rm -rf menu.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ menu$(EXEEXT): $(MENU_OBJECTS) $(__menu___win32rc) $(CXX) -o $@ $(MENU_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__menu___mac_rezcmd) $(__menu___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +menu.app/Contents: menu$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p menu.app/Contents + mkdir -p menu.app/Contents/MacOS + mkdir -p menu.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/menu/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >menu.app/Contents/Info.plist + + + echo -n "APPL????" >menu.app/Contents/PkgInfo + + + ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc menu.app/Contents/Resources/menu.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns menu.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@menu_bundle: menu.app/Contents menu_menu.o: $(srcdir)/menu.cpp $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $< menu_menu_rc.o: $(srcdir)/menu.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install menu_bundle uninstall diff --git a/samples/mfc/Makefile.in b/samples/mfc/Makefile.in index 91315eb469..8c6e7b13e2 100644 --- a/samples/mfc/Makefile.in +++ b/samples/mfc/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib MFCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) MFCTEST_OBJECTS = \ mfctest_mfctest.o \ $(__mfctest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o mfctest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o mfctest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__mfctest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C mfctest$(EXEEXT) @COND_PLATFORM_WIN32_1@__mfctest___win32rc = mfctest_mfctest_rc.o +@COND_PLATFORM_MACOSX_1@__mfctest_bundle___depname = mfctest_bundle ### Targets: ### -all: mfctest$(EXEEXT) +all: mfctest$(EXEEXT) $(__mfctest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f mfctest$(EXEEXT) + rm -rf mfctest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ mfctest$(EXEEXT): $(MFCTEST_OBJECTS) $(__mfctest___win32rc) $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__mfctest___mac_rezcmd) $(__mfctest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +mfctest.app/Contents: mfctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p mfctest.app/Contents + mkdir -p mfctest.app/Contents/MacOS + mkdir -p mfctest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/mfctest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >mfctest.app/Contents/Info.plist + + + echo -n "APPL????" >mfctest.app/Contents/PkgInfo + + + ln -f mfctest$(EXEEXT) mfctest.app/Contents/MacOS/mfctest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc mfctest.app/Contents/Resources/mfctest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns mfctest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@mfctest_bundle: mfctest.app/Contents mfctest_mfctest.o: $(srcdir)/mfctest.cpp $(CXXC) -c -o $@ $(MFCTEST_CXXFLAGS) $< mfctest_mfctest_rc.o: $(srcdir)/mfctest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install mfctest_bundle uninstall diff --git a/samples/minifram/Makefile.in b/samples/minifram/Makefile.in index 9e1ef648a0..01923548cf 100644 --- a/samples/minifram/Makefile.in +++ b/samples/minifram/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib MINIFRAM_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) MINIFRAM_OBJECTS = \ minifram_minifram.o \ $(__minifram___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o minifram$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o minifram$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__minifram___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C minifram$(EXEEXT) @COND_PLATFORM_WIN32_1@__minifram___win32rc = minifram_minifram_rc.o +@COND_PLATFORM_MACOSX_1@__minifram_bundle___depname = minifram_bundle ### Targets: ### -all: minifram$(EXEEXT) +all: minifram$(EXEEXT) $(__minifram_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f minifram$(EXEEXT) + rm -rf minifram.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ minifram$(EXEEXT): $(MINIFRAM_OBJECTS) $(__minifram___win32rc) $(CXX) -o $@ $(MINIFRAM_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__minifram___mac_rezcmd) $(__minifram___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +minifram.app/Contents: minifram$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p minifram.app/Contents + mkdir -p minifram.app/Contents/MacOS + mkdir -p minifram.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/minifram/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >minifram.app/Contents/Info.plist + + + echo -n "APPL????" >minifram.app/Contents/PkgInfo + + + ln -f minifram$(EXEEXT) minifram.app/Contents/MacOS/minifram + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc minifram.app/Contents/Resources/minifram.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns minifram.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@minifram_bundle: minifram.app/Contents minifram_minifram.o: $(srcdir)/minifram.cpp $(CXXC) -c -o $@ $(MINIFRAM_CXXFLAGS) $< minifram_minifram_rc.o: $(srcdir)/minifram.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install minifram_bundle uninstall diff --git a/samples/mobile/Makefile.in b/samples/mobile/Makefile.in index 247ab795c7..af07b233de 100644 --- a/samples/mobile/Makefile.in +++ b/samples/mobile/Makefile.in @@ -22,22 +22,17 @@ INSTALL = @INSTALL@ all: styles wxedit clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o (cd styles && $(MAKE) clean) (cd wxedit && $(MAKE) clean) distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all - (cd styles && $(MAKE) install) - (cd wxedit && $(MAKE) install) install-strip: install - (cd styles && $(MAKE) install-strip) - (cd wxedit && $(MAKE) install-strip) styles: (cd styles && $(MAKE) all) diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in index 6a6d06e9c9..4b8506defc 100644 --- a/samples/mobile/styles/Makefile.in +++ b/samples/mobile/styles/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib STYLES_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) STYLES_OBJECTS = \ $(__styles___win32rc) \ styles_styles.o @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o styles$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o styles$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,15 +123,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__styles___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C styles$(EXEEXT) @COND_PLATFORM_WIN32_1@__styles___win32rc = styles_sample_rc.o +@COND_PLATFORM_MACOSX_1@__styles_bundle___depname = styles_bundle ### Targets: ### -all: styles$(EXEEXT) data +all: styles$(EXEEXT) $(__styles_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f styles$(EXEEXT) + rm -rf styles.app data: @mkdir -p . @@ -141,8 +144,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -152,9 +154,33 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc) $(CXX) -o $@ $(STYLES_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__styles___mac_rezcmd) $(__styles___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +styles.app/Contents: styles$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p styles.app/Contents + mkdir -p styles.app/Contents/MacOS + mkdir -p styles.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/styles/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >styles.app/Contents/Info.plist + + + echo -n "APPL????" >styles.app/Contents/PkgInfo + + + ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc styles.app/Contents/Resources/styles.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns styles.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@styles_bundle: styles.app/Contents styles_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples styles_styles.o: $(srcdir)/styles.cpp $(CXXC) -c -o $@ $(STYLES_CXXFLAGS) $< @@ -165,4 +191,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install styles_bundle uninstall diff --git a/samples/mobile/wxedit/Makefile.in b/samples/mobile/wxedit/Makefile.in index 880b290aba..f69503f73d 100644 --- a/samples/mobile/wxedit/Makefile.in +++ b/samples/mobile/wxedit/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib WXEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) WXEDIT_OBJECTS = \ $(__wxedit___win32rc) \ wxedit_wxedit.o @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o wxedit$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o wxedit$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__wxedit___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxedit$(EXEEXT) @COND_PLATFORM_WIN32_1@__wxedit___win32rc = wxedit_sample_rc.o +@COND_PLATFORM_MACOSX_1@__wxedit_bundle___depname = wxedit_bundle ### Targets: ### -all: wxedit$(EXEEXT) +all: wxedit$(EXEEXT) $(__wxedit_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f wxedit$(EXEEXT) + rm -rf wxedit.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,9 +148,33 @@ wxedit$(EXEEXT): $(WXEDIT_OBJECTS) $(__wxedit___win32rc) $(CXX) -o $@ $(WXEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wxedit___mac_rezcmd) $(__wxedit___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +wxedit.app/Contents: wxedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p wxedit.app/Contents + mkdir -p wxedit.app/Contents/MacOS + mkdir -p wxedit.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/wxedit/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >wxedit.app/Contents/Info.plist + + + echo -n "APPL????" >wxedit.app/Contents/PkgInfo + + + ln -f wxedit$(EXEEXT) wxedit.app/Contents/MacOS/wxedit + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxedit.app/Contents/Resources/wxedit.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns wxedit.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@wxedit_bundle: wxedit.app/Contents wxedit_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples wxedit_wxedit.o: $(srcdir)/wxedit.cpp $(CXXC) -c -o $@ $(WXEDIT_CXXFLAGS) $< @@ -157,4 +183,4 @@ wxedit_wxedit.o: $(srcdir)/wxedit.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install uninstall wxedit_bundle diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 73b8932f05..3de4493c59 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) MULTIMON_TEST_OBJECTS = \ $(__multimon_test___win32rc) \ multimon_test_multimon_test.o @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o multimon_test$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o multimon_test$(EXEEXT) \ + Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C multimon_test$(EXEEXT) @COND_PLATFORM_WIN32_1@__multimon_test___win32rc = \ @COND_PLATFORM_WIN32_1@ multimon_test_sample_rc.o +@COND_PLATFORM_MACOSX_1@__multimon_test_bundle___depname \ +@COND_PLATFORM_MACOSX_1@ = multimon_test_bundle ### Targets: ### -all: multimon_test$(EXEEXT) +all: multimon_test$(EXEEXT) $(__multimon_test_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f multimon_test$(EXEEXT) + rm -rf multimon_test.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,12 +149,36 @@ multimon_test$(EXEEXT): $(MULTIMON_TEST_OBJECTS) $(__multimon_test___win32rc) $(CXX) -o $@ $(MULTIMON_TEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__multimon_test___mac_rezcmd) $(__multimon_test___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +multimon_test.app/Contents: multimon_test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p multimon_test.app/Contents + mkdir -p multimon_test.app/Contents/MacOS + mkdir -p multimon_test.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/multimon_test/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >multimon_test.app/Contents/Info.plist + + + echo -n "APPL????" >multimon_test.app/Contents/PkgInfo + + + ln -f multimon_test$(EXEEXT) multimon_test.app/Contents/MacOS/multimon_test + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc multimon_test.app/Contents/Resources/multimon_test.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns multimon_test.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@multimon_test_bundle: multimon_test.app/Contents multimon_test_multimon_test.o: $(srcdir)/multimon_test.cpp $(CXXC) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $< multimon_test_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -159,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install multimon_test_bundle uninstall diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index c2ff2aaaa0..a7239a43fb 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib NATIVDLG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) NATIVDLG_OBJECTS = \ nativdlg_nativdlg.o \ $(__nativdlg___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o nativdlg$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o nativdlg$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__nativdlg___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C nativdlg$(EXEEXT) @COND_PLATFORM_WIN32_1@__nativdlg___win32rc = nativdlg_nativdlg_rc.o +@COND_PLATFORM_MACOSX_1@__nativdlg_bundle___depname = nativdlg_bundle ### Targets: ### -all: nativdlg$(EXEEXT) +all: nativdlg$(EXEEXT) $(__nativdlg_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f nativdlg$(EXEEXT) + rm -rf nativdlg.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ nativdlg$(EXEEXT): $(NATIVDLG_OBJECTS) $(__nativdlg___win32rc) $(CXX) -o $@ $(NATIVDLG_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__nativdlg___mac_rezcmd) $(__nativdlg___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +nativdlg.app/Contents: nativdlg$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p nativdlg.app/Contents + mkdir -p nativdlg.app/Contents/MacOS + mkdir -p nativdlg.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/nativdlg/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >nativdlg.app/Contents/Info.plist + + + echo -n "APPL????" >nativdlg.app/Contents/PkgInfo + + + ln -f nativdlg$(EXEEXT) nativdlg.app/Contents/MacOS/nativdlg + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc nativdlg.app/Contents/Resources/nativdlg.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns nativdlg.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@nativdlg_bundle: nativdlg.app/Contents nativdlg_nativdlg.o: $(srcdir)/nativdlg.cpp $(CXXC) -c -o $@ $(NATIVDLG_CXXFLAGS) $< nativdlg_nativdlg_rc.o: $(srcdir)/nativdlg.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install nativdlg_bundle uninstall diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index ac9632d6db..10e2b164fb 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib NOTEBOOK_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) NOTEBOOK_OBJECTS = \ notebook_notebook.o \ $(__notebook___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o notebook$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o notebook$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__notebook___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C notebook$(EXEEXT) @COND_PLATFORM_WIN32_1@__notebook___win32rc = notebook_notebook_rc.o +@COND_PLATFORM_MACOSX_1@__notebook_bundle___depname = notebook_bundle ### Targets: ### -all: notebook$(EXEEXT) +all: notebook$(EXEEXT) $(__notebook_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f notebook$(EXEEXT) + rm -rf notebook.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ notebook$(EXEEXT): $(NOTEBOOK_OBJECTS) $(__notebook___win32rc) $(CXX) -o $@ $(NOTEBOOK_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__notebook___mac_rezcmd) $(__notebook___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +notebook.app/Contents: notebook$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p notebook.app/Contents + mkdir -p notebook.app/Contents/MacOS + mkdir -p notebook.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/notebook/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >notebook.app/Contents/Info.plist + + + echo -n "APPL????" >notebook.app/Contents/PkgInfo + + + ln -f notebook$(EXEEXT) notebook.app/Contents/MacOS/notebook + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc notebook.app/Contents/Resources/notebook.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns notebook.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@notebook_bundle: notebook.app/Contents notebook_notebook.o: $(srcdir)/notebook.cpp $(CXXC) -c -o $@ $(NOTEBOOK_CXXFLAGS) $< notebook_notebook_rc.o: $(srcdir)/notebook.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install notebook_bundle uninstall diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 87b175a8a9..ccd7c50833 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib OLEAUTO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) OLEAUTO_OBJECTS = \ oleauto_oleauto.o \ $(__oleauto___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o oleauto$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o oleauto$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__oleauto___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C oleauto$(EXEEXT) @COND_PLATFORM_WIN32_1@__oleauto___win32rc = oleauto_oleauto_rc.o +@COND_PLATFORM_MACOSX_1@__oleauto_bundle___depname = oleauto_bundle ### Targets: ### -all: oleauto$(EXEEXT) +all: oleauto$(EXEEXT) $(__oleauto_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f oleauto$(EXEEXT) + rm -rf oleauto.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ oleauto$(EXEEXT): $(OLEAUTO_OBJECTS) $(__oleauto___win32rc) $(CXX) -o $@ $(OLEAUTO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__oleauto___mac_rezcmd) $(__oleauto___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +oleauto.app/Contents: oleauto$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p oleauto.app/Contents + mkdir -p oleauto.app/Contents/MacOS + mkdir -p oleauto.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/oleauto/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >oleauto.app/Contents/Info.plist + + + echo -n "APPL????" >oleauto.app/Contents/PkgInfo + + + ln -f oleauto$(EXEEXT) oleauto.app/Contents/MacOS/oleauto + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc oleauto.app/Contents/Resources/oleauto.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns oleauto.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@oleauto_bundle: oleauto.app/Contents oleauto_oleauto.o: $(srcdir)/oleauto.cpp $(CXXC) -c -o $@ $(OLEAUTO_CXXFLAGS) $< oleauto_oleauto_rc.o: $(srcdir)/oleauto.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install oleauto_bundle uninstall diff --git a/samples/opengl/Makefile.in b/samples/opengl/Makefile.in index ff243113b2..fe674659d2 100644 --- a/samples/opengl/Makefile.in +++ b/samples/opengl/Makefile.in @@ -22,7 +22,7 @@ INSTALL = @INSTALL@ all: cube isosurf penguin clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o (cd cube && $(MAKE) clean) (cd isosurf && $(MAKE) clean) @@ -32,18 +32,11 @@ cube: (cd cube && $(MAKE) all) distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all - (cd cube && $(MAKE) install) - (cd isosurf && $(MAKE) install) - (cd penguin && $(MAKE) install) install-strip: install - (cd cube && $(MAKE) install-strip) - (cd isosurf && $(MAKE) install-strip) - (cd penguin && $(MAKE) install-strip) isosurf: (cd isosurf && $(MAKE) all) diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index a5081031a2..4fe168169f 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CUBE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) CUBE_OBJECTS = \ cube_cube.o \ $(__cube___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o cube$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o cube$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C cube$(EXEEXT) @COND_PLATFORM_WIN32_1@__cube___win32rc = cube_cube_rc.o +@COND_PLATFORM_MACOSX_1@__cube_bundle___depname = cube_bundle ### Targets: ### -all: cube$(EXEEXT) +all: cube$(EXEEXT) $(__cube_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f cube$(EXEEXT) + rm -rf cube.app cube$(EXEEXT): $(CUBE_OBJECTS) $(__cube___win32rc) $(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__cube___mac_rezcmd) $(__cube___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +cube.app/Contents: cube$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p cube.app/Contents + mkdir -p cube.app/Contents/MacOS + mkdir -p cube.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/cube/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >cube.app/Contents/Info.plist + + + echo -n "APPL????" >cube.app/Contents/PkgInfo + + + ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc cube.app/Contents/Resources/cube.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns cube.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@cube_bundle: cube.app/Contents cube_cube.o: $(srcdir)/cube.cpp $(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $< cube_cube_rc.o: $(srcdir)/cube.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean cube_bundle distclean install uninstall diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index 90757c2bb7..c25846e26c 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ ISOSURF_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) ISOSURF_OBJECTS = \ isosurf_isosurf.o \ $(__isosurf___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o isosurf$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o isosurf$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,15 +123,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__isosurf___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C isosurf$(EXEEXT) @COND_PLATFORM_WIN32_1@__isosurf___win32rc = isosurf_cube_rc.o +@COND_PLATFORM_MACOSX_1@__isosurf_bundle___depname = isosurf_bundle ### Targets: ### -all: isosurf$(EXEEXT) data +all: isosurf$(EXEEXT) $(__isosurf_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f isosurf$(EXEEXT) + rm -rf isosurf.app data: @mkdir -p . @@ -141,8 +144,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -152,9 +154,33 @@ isosurf$(EXEEXT): $(ISOSURF_OBJECTS) $(__isosurf___win32rc) $(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__isosurf___mac_rezcmd) $(__isosurf___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +isosurf.app/Contents: isosurf$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p isosurf.app/Contents + mkdir -p isosurf.app/Contents/MacOS + mkdir -p isosurf.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/isosurf/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >isosurf.app/Contents/Info.plist + + + echo -n "APPL????" >isosurf.app/Contents/PkgInfo + + + ln -f isosurf$(EXEEXT) isosurf.app/Contents/MacOS/isosurf + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc isosurf.app/Contents/Resources/isosurf.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns isosurf.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@isosurf_bundle: isosurf.app/Contents isosurf_cube_rc.o: $(srcdir)/cube.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples isosurf_isosurf.o: $(srcdir)/isosurf.cpp $(CXXC) -c -o $@ $(ISOSURF_CXXFLAGS) $< @@ -165,4 +191,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install isosurf_bundle uninstall diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 5880db48d1..858d408c24 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -23,6 +23,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -38,11 +39,11 @@ LIBDIRNAME = $(top_builddir)lib PENGUIN_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CFLAGS) PENGUIN_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXFLAGS) PENGUIN_OBJECTS = \ penguin_penguin.o \ penguin_lw.o \ @@ -114,8 +115,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -o penguin$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -o penguin$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -132,15 +133,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__penguin___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C penguin$(EXEEXT) @COND_PLATFORM_WIN32_1@__penguin___win32rc = penguin_penguin_rc.o +@COND_PLATFORM_MACOSX_1@__penguin_bundle___depname = penguin_bundle ### Targets: ### -all: penguin$(EXEEXT) data +all: penguin$(EXEEXT) $(__penguin_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f penguin$(EXEEXT) + rm -rf penguin.app data: @mkdir -p . @@ -151,8 +154,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -162,6 +164,30 @@ penguin$(EXEEXT): $(PENGUIN_OBJECTS) $(__penguin___win32rc) $(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__penguin___mac_rezcmd) $(__penguin___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +penguin.app/Contents: penguin$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p penguin.app/Contents + mkdir -p penguin.app/Contents/MacOS + mkdir -p penguin.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/penguin/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >penguin.app/Contents/Info.plist + + + echo -n "APPL????" >penguin.app/Contents/PkgInfo + + + ln -f penguin$(EXEEXT) penguin.app/Contents/MacOS/penguin + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc penguin.app/Contents/Resources/penguin.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns penguin.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@penguin_bundle: penguin.app/Contents penguin_lw.o: $(srcdir)/lw.cpp $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $< @@ -170,7 +196,7 @@ penguin_penguin.o: $(srcdir)/penguin.cpp $(CXXC) -c -o $@ $(PENGUIN_CXXFLAGS) $< penguin_penguin_rc.o: $(srcdir)/penguin.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples penguin_trackball.o: $(srcdir)/trackball.c $(CCC) -c -o $@ $(PENGUIN_CFLAGS) $< @@ -181,4 +207,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install penguin_bundle uninstall diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index 3a68fc498e..226cc2090e 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib OWNERDRW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) OWNERDRW_OBJECTS = \ ownerdrw_ownerdrw.o \ $(__ownerdrw___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o ownerdrw$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o ownerdrw$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__ownerdrw___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ownerdrw$(EXEEXT) @COND_PLATFORM_WIN32_1@__ownerdrw___win32rc = ownerdrw_ownerdrw_rc.o +@COND_PLATFORM_MACOSX_1@__ownerdrw_bundle___depname = ownerdrw_bundle ### Targets: ### -all: ownerdrw$(EXEEXT) +all: ownerdrw$(EXEEXT) $(__ownerdrw_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f ownerdrw$(EXEEXT) + rm -rf ownerdrw.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ ownerdrw$(EXEEXT): $(OWNERDRW_OBJECTS) $(__ownerdrw___win32rc) $(CXX) -o $@ $(OWNERDRW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__ownerdrw___mac_rezcmd) $(__ownerdrw___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +ownerdrw.app/Contents: ownerdrw$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p ownerdrw.app/Contents + mkdir -p ownerdrw.app/Contents/MacOS + mkdir -p ownerdrw.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/ownerdrw/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >ownerdrw.app/Contents/Info.plist + + + echo -n "APPL????" >ownerdrw.app/Contents/PkgInfo + + + ln -f ownerdrw$(EXEEXT) ownerdrw.app/Contents/MacOS/ownerdrw + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ownerdrw.app/Contents/Resources/ownerdrw.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns ownerdrw.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@ownerdrw_bundle: ownerdrw.app/Contents ownerdrw_ownerdrw.o: $(srcdir)/ownerdrw.cpp $(CXXC) -c -o $@ $(OWNERDRW_CXXFLAGS) $< ownerdrw_ownerdrw_rc.o: $(srcdir)/ownerdrw.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install ownerdrw_bundle uninstall diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in index 65e3ca3515..f58177b11f 100644 --- a/samples/png/Makefile.in +++ b/samples/png/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib PNG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) PNG_OBJECTS = \ png_pngdemo.o \ $(__png___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o png$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o png$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -121,19 +122,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT) @COND_PLATFORM_WIN32_1@__png___win32rc = png_pngdemo_rc.o +@COND_PLATFORM_MACOSX_1@__png_bundle___depname = png_bundle ### Targets: ### -all: png$(EXEEXT) +all: png$(EXEEXT) $(__png_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f png$(EXEEXT) + rm -rf png.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -143,12 +145,36 @@ png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc) $(CXX) -o $@ $(PNG_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__png___mac_rezcmd) $(__png___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +png.app/Contents: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p png.app/Contents + mkdir -p png.app/Contents/MacOS + mkdir -p png.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/png/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >png.app/Contents/Info.plist + + + echo -n "APPL????" >png.app/Contents/PkgInfo + + + ln -f png$(EXEEXT) png.app/Contents/MacOS/png + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc png.app/Contents/Resources/png.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns png.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@png_bundle: png.app/Contents png_pngdemo.o: $(srcdir)/pngdemo.cpp $(CXXC) -c -o $@ $(PNG_CXXFLAGS) $< png_pngdemo_rc.o: $(srcdir)/pngdemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -156,4 +182,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install png_bundle uninstall diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 42adc7c4ec..732da2e67e 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib PRINTING_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) PRINTING_OBJECTS = \ printing_printing.o \ $(__printing___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o printing$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o printing$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__printing___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C printing$(EXEEXT) @COND_PLATFORM_WIN32_1@__printing___win32rc = printing_printing_rc.o +@COND_PLATFORM_MACOSX_1@__printing_bundle___depname = printing_bundle ### Targets: ### -all: printing$(EXEEXT) +all: printing$(EXEEXT) $(__printing_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f printing$(EXEEXT) + rm -rf printing.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ printing$(EXEEXT): $(PRINTING_OBJECTS) $(__printing___win32rc) $(CXX) -o $@ $(PRINTING_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__printing___mac_rezcmd) $(__printing___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +printing.app/Contents: printing$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p printing.app/Contents + mkdir -p printing.app/Contents/MacOS + mkdir -p printing.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/printing/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >printing.app/Contents/Info.plist + + + echo -n "APPL????" >printing.app/Contents/PkgInfo + + + ln -f printing$(EXEEXT) printing.app/Contents/MacOS/printing + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc printing.app/Contents/Resources/printing.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns printing.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@printing_bundle: printing.app/Contents printing_printing.o: $(srcdir)/printing.cpp $(CXXC) -c -o $@ $(PRINTING_CXXFLAGS) $< printing_printing_rc.o: $(srcdir)/printing.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install printing_bundle uninstall diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index f1484347eb..3b465e33f1 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib PROPSIZE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) PROPSIZE_OBJECTS = \ propsize_propsize.o \ $(__propsize___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o propsize$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o propsize$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__propsize___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C propsize$(EXEEXT) @COND_PLATFORM_WIN32_1@__propsize___win32rc = propsize_propsize_rc.o +@COND_PLATFORM_MACOSX_1@__propsize_bundle___depname = propsize_bundle ### Targets: ### -all: propsize$(EXEEXT) +all: propsize$(EXEEXT) $(__propsize_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f propsize$(EXEEXT) + rm -rf propsize.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ propsize$(EXEEXT): $(PROPSIZE_OBJECTS) $(__propsize___win32rc) $(CXX) -o $@ $(PROPSIZE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__propsize___mac_rezcmd) $(__propsize___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +propsize.app/Contents: propsize$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p propsize.app/Contents + mkdir -p propsize.app/Contents/MacOS + mkdir -p propsize.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/propsize/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >propsize.app/Contents/Info.plist + + + echo -n "APPL????" >propsize.app/Contents/PkgInfo + + + ln -f propsize$(EXEEXT) propsize.app/Contents/MacOS/propsize + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc propsize.app/Contents/Resources/propsize.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns propsize.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@propsize_bundle: propsize.app/Contents propsize_propsize.o: $(srcdir)/propsize.cpp $(CXXC) -c -o $@ $(PROPSIZE_CXXFLAGS) $< propsize_propsize_rc.o: $(srcdir)/propsize.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install propsize_bundle uninstall diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index c2853d60b7..8e791a86ea 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib REGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) REGTEST_OBJECTS = \ regtest_regtest.o \ $(__regtest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o regtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o regtest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__regtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C regtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__regtest___win32rc = regtest_regtest_rc.o +@COND_PLATFORM_MACOSX_1@__regtest_bundle___depname = regtest_bundle ### Targets: ### -all: regtest$(EXEEXT) +all: regtest$(EXEEXT) $(__regtest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f regtest$(EXEEXT) + rm -rf regtest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ regtest$(EXEEXT): $(REGTEST_OBJECTS) $(__regtest___win32rc) $(CXX) -o $@ $(REGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__regtest___mac_rezcmd) $(__regtest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +regtest.app/Contents: regtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p regtest.app/Contents + mkdir -p regtest.app/Contents/MacOS + mkdir -p regtest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/regtest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >regtest.app/Contents/Info.plist + + + echo -n "APPL????" >regtest.app/Contents/PkgInfo + + + ln -f regtest$(EXEEXT) regtest.app/Contents/MacOS/regtest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc regtest.app/Contents/Resources/regtest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns regtest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@regtest_bundle: regtest.app/Contents regtest_regtest.o: $(srcdir)/regtest.cpp $(CXXC) -c -o $@ $(REGTEST_CXXFLAGS) $< regtest_regtest_rc.o: $(srcdir)/regtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install regtest_bundle uninstall diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index 0472fc49a3..eab66672fe 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -23,6 +23,7 @@ LDFLAGS_GUI = @LDFLAGS_GUI@ PIC_FLAG = @PIC_FLAG@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@ SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@ @@ -46,7 +47,7 @@ RENDDLL_OBJECTS = \ RENDER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) RENDER_OBJECTS = \ $(__render___win32rc) \ render_render.o @@ -116,8 +117,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o render$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o render$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -137,20 +138,21 @@ COND_SHARED_1___renddll___depname = \ @COND_PLATFORM_MAC_1@__render___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C render$(EXEEXT) @COND_PLATFORM_WIN32_1@__render___win32rc = render_sample_rc.o +@COND_PLATFORM_MACOSX_1@__render_bundle___depname = render_bundle ### Targets: ### -all: render$(EXEEXT) $(__renddll___depname) +all: render$(EXEEXT) $(__render_bundle___depname) $(__renddll___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f render$(EXEEXT) + rm -rf render.app rm -f $(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGIN_VERSION).$(SO_SUFFIX_MODULE) distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -166,12 +168,36 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc) $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__render___mac_rezcmd) $(__render___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +render.app/Contents: render$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p render.app/Contents + mkdir -p render.app/Contents/MacOS + mkdir -p render.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/render/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >render.app/Contents/Info.plist + + + echo -n "APPL????" >render.app/Contents/PkgInfo + + + ln -f render$(EXEEXT) render.app/Contents/MacOS/render + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc render.app/Contents/Resources/render.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns render.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@render_bundle: render.app/Contents render_render.o: $(srcdir)/render.cpp $(CXXC) -c -o $@ $(RENDER_CXXFLAGS) $< render_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -179,4 +205,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install render_bundle uninstall diff --git a/samples/richedit/Makefile.in b/samples/richedit/Makefile.in index bd29129879..9917fb9022 100644 --- a/samples/richedit/Makefile.in +++ b/samples/richedit/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib RICHEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) RICHEDIT_OBJECTS = \ $(__richedit___win32rc) \ richedit_wxLayout.o \ @@ -108,8 +109,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o richedit$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o richedit$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -126,19 +127,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__richedit___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C richedit$(EXEEXT) @COND_PLATFORM_WIN32_1@__richedit___win32rc = richedit_sample_rc.o +@COND_PLATFORM_MACOSX_1@__richedit_bundle___depname = richedit_bundle ### Targets: ### -all: richedit$(EXEEXT) +all: richedit$(EXEEXT) $(__richedit_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f richedit$(EXEEXT) + rm -rf richedit.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -148,12 +150,36 @@ richedit$(EXEEXT): $(RICHEDIT_OBJECTS) $(__richedit___win32rc) $(CXX) -o $@ $(RICHEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__richedit___mac_rezcmd) $(__richedit___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +richedit.app/Contents: richedit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p richedit.app/Contents + mkdir -p richedit.app/Contents/MacOS + mkdir -p richedit.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/richedit/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >richedit.app/Contents/Info.plist + + + echo -n "APPL????" >richedit.app/Contents/PkgInfo + + + ln -f richedit$(EXEEXT) richedit.app/Contents/MacOS/richedit + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc richedit.app/Contents/Resources/richedit.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns richedit.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@richedit_bundle: richedit.app/Contents richedit_kbList.o: $(srcdir)/kbList.cpp $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< richedit_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples richedit_wxLayout.o: $(srcdir)/wxLayout.cpp $(CXXC) -c -o $@ $(RICHEDIT_CXXFLAGS) $< @@ -173,4 +199,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install richedit_bundle uninstall diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index 876c878968..76af0559e6 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib ROTATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) ROTATE_OBJECTS = \ rotate_rotate.o \ $(__rotate___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o rotate$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o rotate$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__rotate___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C rotate$(EXEEXT) @COND_PLATFORM_WIN32_1@__rotate___win32rc = rotate_rotate_rc.o +@COND_PLATFORM_MACOSX_1@__rotate_bundle___depname = rotate_bundle ### Targets: ### -all: rotate$(EXEEXT) +all: rotate$(EXEEXT) $(__rotate_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f rotate$(EXEEXT) + rm -rf rotate.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ rotate$(EXEEXT): $(ROTATE_OBJECTS) $(__rotate___win32rc) $(CXX) -o $@ $(ROTATE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__rotate___mac_rezcmd) $(__rotate___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +rotate.app/Contents: rotate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p rotate.app/Contents + mkdir -p rotate.app/Contents/MacOS + mkdir -p rotate.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/rotate/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >rotate.app/Contents/Info.plist + + + echo -n "APPL????" >rotate.app/Contents/PkgInfo + + + ln -f rotate$(EXEEXT) rotate.app/Contents/MacOS/rotate + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc rotate.app/Contents/Resources/rotate.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns rotate.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@rotate_bundle: rotate.app/Contents rotate_rotate.o: $(srcdir)/rotate.cpp $(CXXC) -c -o $@ $(ROTATE_CXXFLAGS) $< rotate_rotate_rc.o: $(srcdir)/rotate.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install rotate_bundle uninstall diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index c588141a6d..170dcbe085 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib SASHTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) SASHTEST_OBJECTS = \ sashtest_sashtest.o \ $(__sashtest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o sashtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o sashtest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -125,19 +126,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__sashtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C sashtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__sashtest___win32rc = sashtest_sashtest_rc.o +@COND_PLATFORM_MACOSX_1@__sashtest_bundle___depname = sashtest_bundle ### Targets: ### -all: sashtest$(EXEEXT) +all: sashtest$(EXEEXT) $(__sashtest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f sashtest$(EXEEXT) + rm -rf sashtest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -147,12 +149,36 @@ sashtest$(EXEEXT): $(SASHTEST_OBJECTS) $(__sashtest___win32rc) $(CXX) -o $@ $(SASHTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__sashtest___mac_rezcmd) $(__sashtest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +sashtest.app/Contents: sashtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p sashtest.app/Contents + mkdir -p sashtest.app/Contents/MacOS + mkdir -p sashtest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/sashtest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >sashtest.app/Contents/Info.plist + + + echo -n "APPL????" >sashtest.app/Contents/PkgInfo + + + ln -f sashtest$(EXEEXT) sashtest.app/Contents/MacOS/sashtest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc sashtest.app/Contents/Resources/sashtest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns sashtest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@sashtest_bundle: sashtest.app/Contents sashtest_sashtest.o: $(srcdir)/sashtest.cpp $(CXXC) -c -o $@ $(SASHTEST_CXXFLAGS) $< sashtest_sashtest_rc.o: $(srcdir)/sashtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -160,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install sashtest_bundle uninstall diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in index 5396a5a6ae..c4ced1fb71 100644 --- a/samples/scroll/Makefile.in +++ b/samples/scroll/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib SCROLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) SCROLL_OBJECTS = \ scroll_scroll.o \ $(__scroll___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o scroll$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scroll$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__scroll___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C scroll$(EXEEXT) @COND_PLATFORM_WIN32_1@__scroll___win32rc = scroll_scroll_rc.o +@COND_PLATFORM_MACOSX_1@__scroll_bundle___depname = scroll_bundle ### Targets: ### -all: scroll$(EXEEXT) +all: scroll$(EXEEXT) $(__scroll_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f scroll$(EXEEXT) + rm -rf scroll.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ scroll$(EXEEXT): $(SCROLL_OBJECTS) $(__scroll___win32rc) $(CXX) -o $@ $(SCROLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__scroll___mac_rezcmd) $(__scroll___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +scroll.app/Contents: scroll$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p scroll.app/Contents + mkdir -p scroll.app/Contents/MacOS + mkdir -p scroll.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/scroll/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >scroll.app/Contents/Info.plist + + + echo -n "APPL????" >scroll.app/Contents/PkgInfo + + + ln -f scroll$(EXEEXT) scroll.app/Contents/MacOS/scroll + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scroll.app/Contents/Resources/scroll.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns scroll.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@scroll_bundle: scroll.app/Contents scroll_scroll.o: $(srcdir)/scroll.cpp $(CXXC) -c -o $@ $(SCROLL_CXXFLAGS) $< scroll_scroll_rc.o: $(srcdir)/scroll.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install scroll_bundle uninstall diff --git a/samples/scrollsub/Makefile.in b/samples/scrollsub/Makefile.in index 589b0b6ef1..8732066374 100644 --- a/samples/scrollsub/Makefile.in +++ b/samples/scrollsub/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib SCROLLSUB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) SCROLLSUB_OBJECTS = \ scrollsub_scrollsub.o \ $(__scrollsub___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o scrollsub$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o scrollsub$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__scrollsub___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C scrollsub$(EXEEXT) @COND_PLATFORM_WIN32_1@__scrollsub___win32rc = scrollsub_scrollsub_rc.o +@COND_PLATFORM_MACOSX_1@__scrollsub_bundle___depname = scrollsub_bundle ### Targets: ### -all: scrollsub$(EXEEXT) +all: scrollsub$(EXEEXT) $(__scrollsub_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f scrollsub$(EXEEXT) + rm -rf scrollsub.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ scrollsub$(EXEEXT): $(SCROLLSUB_OBJECTS) $(__scrollsub___win32rc) $(CXX) -o $@ $(SCROLLSUB_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__scrollsub___mac_rezcmd) $(__scrollsub___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +scrollsub.app/Contents: scrollsub$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p scrollsub.app/Contents + mkdir -p scrollsub.app/Contents/MacOS + mkdir -p scrollsub.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/scrollsub/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >scrollsub.app/Contents/Info.plist + + + echo -n "APPL????" >scrollsub.app/Contents/PkgInfo + + + ln -f scrollsub$(EXEEXT) scrollsub.app/Contents/MacOS/scrollsub + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc scrollsub.app/Contents/Resources/scrollsub.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns scrollsub.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@scrollsub_bundle: scrollsub.app/Contents scrollsub_scrollsub.o: $(srcdir)/scrollsub.cpp $(CXXC) -c -o $@ $(SCROLLSUB_CXXFLAGS) $< scrollsub_scrollsub_rc.o: $(srcdir)/scrollsub.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install scrollsub_bundle uninstall diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in index 179907ae5f..103e1481be 100644 --- a/samples/shaped/Makefile.in +++ b/samples/shaped/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib SHAPED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) SHAPED_OBJECTS = \ shaped_shaped.o \ $(__shaped___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o shaped$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o shaped$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__shaped___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C shaped$(EXEEXT) @COND_PLATFORM_WIN32_1@__shaped___win32rc = shaped_shaped_rc.o +@COND_PLATFORM_MACOSX_1@__shaped_bundle___depname = shaped_bundle ### Targets: ### -all: shaped$(EXEEXT) +all: shaped$(EXEEXT) $(__shaped_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f shaped$(EXEEXT) + rm -rf shaped.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ shaped$(EXEEXT): $(SHAPED_OBJECTS) $(__shaped___win32rc) $(CXX) -o $@ $(SHAPED_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__shaped___mac_rezcmd) $(__shaped___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +shaped.app/Contents: shaped$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p shaped.app/Contents + mkdir -p shaped.app/Contents/MacOS + mkdir -p shaped.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/shaped/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >shaped.app/Contents/Info.plist + + + echo -n "APPL????" >shaped.app/Contents/PkgInfo + + + ln -f shaped$(EXEEXT) shaped.app/Contents/MacOS/shaped + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc shaped.app/Contents/Resources/shaped.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns shaped.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@shaped_bundle: shaped.app/Contents shaped_shaped.o: $(srcdir)/shaped.cpp $(CXXC) -c -o $@ $(SHAPED_CXXFLAGS) $< shaped_shaped_rc.o: $(srcdir)/shaped.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install shaped_bundle uninstall diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index 7c3fcb5b13..93ca55372a 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@ CLIENT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) CLIENT_OBJECTS = \ client_client.o \ $(__client___win32rc) @@ -43,7 +44,7 @@ LIBDIRNAME = $(top_builddir)lib SERVER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) SERVER_OBJECTS = \ server_server.o \ $(__server___win32rc) @@ -111,15 +112,15 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \ $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \ $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \ - $(__DLLFLAG_p_6) -i ../../samples -o client$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o client$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_2 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_2) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_0) -i $(top_srcdir)/include \ $(__INC_TIFF_p_0) $(__INC_JPEG_p_6) $(__INC_PNG_p_6) $(__INC_ZLIB_p_0) \ $(__INC_ODBC_p_0) $(__INC_REGEX_p_0) $(__INC_EXPAT_p_6) -i $(srcdir) \ - $(__DLLFLAG_p_6) -i ../../samples -o server$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_6) -i $(srcdir)/../../samples -o server$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_3 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_3) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -138,35 +139,62 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__client___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C client$(EXEEXT) @COND_PLATFORM_WIN32_1@__client___win32rc = client_client_rc.o +@COND_PLATFORM_MACOSX_1@__client_bundle___depname = client_bundle @COND_PLATFORM_MAC_1@__server___mac_rezcmd = $(__MACOSX_RESOURCES_p_3) @COND_PLATFORM_MAC_1@__server___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C server$(EXEEXT) @COND_PLATFORM_WIN32_1@__server___win32rc = server_server_rc.o +@COND_PLATFORM_MACOSX_1@__server_bundle___depname = server_bundle ### Targets: ### -all: client$(EXEEXT) server$(EXEEXT) +all: client$(EXEEXT) $(__client_bundle___depname) server$(EXEEXT) $(__server_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f client$(EXEEXT) + rm -rf client.app rm -f server$(EXEEXT) + rm -rf server.app client$(EXEEXT): $(CLIENT_OBJECTS) $(__client___win32rc) $(CXX) -o $@ $(CLIENT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__client___mac_rezcmd) $(__client___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +client.app/Contents: client$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p client.app/Contents + mkdir -p client.app/Contents/MacOS + mkdir -p client.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/client/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >client.app/Contents/Info.plist + + + echo -n "APPL????" >client.app/Contents/PkgInfo + + + ln -f client$(EXEEXT) client.app/Contents/MacOS/client + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc client.app/Contents/Resources/client.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns client.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@client_bundle: client.app/Contents client_client.o: $(srcdir)/client.cpp $(CXXC) -c -o $@ $(CLIENT_CXXFLAGS) $< client_client_rc.o: $(srcdir)/client.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -176,12 +204,36 @@ server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc) $(CXX) -o $@ $(SERVER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__server___mac_rezcmd) $(__server___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +server.app/Contents: server$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p server.app/Contents + mkdir -p server.app/Contents/MacOS + mkdir -p server.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/server/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >server.app/Contents/Info.plist + + + echo -n "APPL????" >server.app/Contents/PkgInfo + + + ln -f server$(EXEEXT) server.app/Contents/MacOS/server + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc server.app/Contents/Resources/server.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns server.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@server_bundle: server.app/Contents server_server.o: $(srcdir)/server.cpp $(CXXC) -c -o $@ $(SERVER_CXXFLAGS) $< server_server_rc.o: $(srcdir)/server.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_6) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_6) $(__INC_JPEG_p_0) $(__INC_PNG_p_0) $(__INC_ZLIB_p_6) $(__INC_ODBC_p_6) $(__INC_REGEX_p_6) $(__INC_EXPAT_p_0) --include-dir $(srcdir) $(__DLLFLAG_p_0) --include-dir $(srcdir)/../../samples uninstall: @@ -189,4 +241,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean client_bundle distclean install server_bundle uninstall diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in index 93608dce6a..13cfc89ab2 100644 --- a/samples/splitter/Makefile.in +++ b/samples/splitter/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib SPLITTER_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) SPLITTER_OBJECTS = \ splitter_splitter.o \ $(__splitter___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o splitter$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o splitter$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__splitter___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C splitter$(EXEEXT) @COND_PLATFORM_WIN32_1@__splitter___win32rc = splitter_splitter_rc.o +@COND_PLATFORM_MACOSX_1@__splitter_bundle___depname = splitter_bundle ### Targets: ### -all: splitter$(EXEEXT) +all: splitter$(EXEEXT) $(__splitter_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f splitter$(EXEEXT) + rm -rf splitter.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ splitter$(EXEEXT): $(SPLITTER_OBJECTS) $(__splitter___win32rc) $(CXX) -o $@ $(SPLITTER_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__splitter___mac_rezcmd) $(__splitter___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +splitter.app/Contents: splitter$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p splitter.app/Contents + mkdir -p splitter.app/Contents/MacOS + mkdir -p splitter.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/splitter/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >splitter.app/Contents/Info.plist + + + echo -n "APPL????" >splitter.app/Contents/PkgInfo + + + ln -f splitter$(EXEEXT) splitter.app/Contents/MacOS/splitter + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc splitter.app/Contents/Resources/splitter.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns splitter.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@splitter_bundle: splitter.app/Contents splitter_splitter.o: $(srcdir)/splitter.cpp $(CXXC) -c -o $@ $(SPLITTER_CXXFLAGS) $< splitter_splitter_rc.o: $(srcdir)/splitter.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install splitter_bundle uninstall diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in index 23e8c163ab..94af96e157 100644 --- a/samples/statbar/Makefile.in +++ b/samples/statbar/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib STATBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) STATBAR_OBJECTS = \ statbar_statbar.o \ $(__statbar___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o statbar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o statbar$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__statbar___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C statbar$(EXEEXT) @COND_PLATFORM_WIN32_1@__statbar___win32rc = statbar_statbar_rc.o +@COND_PLATFORM_MACOSX_1@__statbar_bundle___depname = statbar_bundle ### Targets: ### -all: statbar$(EXEEXT) +all: statbar$(EXEEXT) $(__statbar_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f statbar$(EXEEXT) + rm -rf statbar.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ statbar$(EXEEXT): $(STATBAR_OBJECTS) $(__statbar___win32rc) $(CXX) -o $@ $(STATBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__statbar___mac_rezcmd) $(__statbar___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +statbar.app/Contents: statbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p statbar.app/Contents + mkdir -p statbar.app/Contents/MacOS + mkdir -p statbar.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/statbar/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >statbar.app/Contents/Info.plist + + + echo -n "APPL????" >statbar.app/Contents/PkgInfo + + + ln -f statbar$(EXEEXT) statbar.app/Contents/MacOS/statbar + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc statbar.app/Contents/Resources/statbar.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns statbar.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@statbar_bundle: statbar.app/Contents statbar_statbar.o: $(srcdir)/statbar.cpp $(CXXC) -c -o $@ $(STATBAR_CXXFLAGS) $< statbar_statbar_rc.o: $(srcdir)/statbar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install statbar_bundle uninstall diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in index f4f1d73cf6..e44eb50c45 100644 --- a/samples/stc/Makefile.in +++ b/samples/stc/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib STCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) STCTEST_OBJECTS = \ $(__stctest___win32rc) \ stctest_stctest.o @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ stctest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,15 +125,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__stctest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C stctest$(EXEEXT) @COND_PLATFORM_WIN32_1@__stctest___win32rc = stctest_sample_rc.o +@COND_PLATFORM_MACOSX_1@__stctest_bundle___depname = stctest_bundle ### Targets: ### -all: stctest$(EXEEXT) data +all: stctest$(EXEEXT) $(__stctest_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f stctest$(EXEEXT) + rm -rf stctest.app data: @mkdir -p . @@ -143,8 +146,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -154,9 +156,33 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc) $(CXX) -o $@ $(STCTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__stctest___mac_rezcmd) $(__stctest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +stctest.app/Contents: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p stctest.app/Contents + mkdir -p stctest.app/Contents/MacOS + mkdir -p stctest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/stctest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >stctest.app/Contents/Info.plist + + + echo -n "APPL????" >stctest.app/Contents/PkgInfo + + + ln -f stctest$(EXEEXT) stctest.app/Contents/MacOS/stctest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc stctest.app/Contents/Resources/stctest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns stctest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@stctest_bundle: stctest.app/Contents stctest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples stctest_stctest.o: $(srcdir)/stctest.cpp $(CXXC) -c -o $@ $(STCTEST_CXXFLAGS) $< @@ -167,4 +193,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install stctest_bundle uninstall diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in index e0bf0aecd0..fc6afd4611 100644 --- a/samples/svg/Makefile.in +++ b/samples/svg/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib SVGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) SVGTEST_OBJECTS = \ $(__svgtest___win32rc) \ svgtest_svgtest.o @@ -105,9 +106,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -124,19 +125,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__svgtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C svgtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__svgtest___win32rc = svgtest_sample_rc.o +@COND_PLATFORM_MACOSX_1@__svgtest_bundle___depname = svgtest_bundle ### Targets: ### -all: svgtest$(EXEEXT) +all: svgtest$(EXEEXT) $(__svgtest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f svgtest$(EXEEXT) + rm -rf svgtest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,9 +148,33 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc) $(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__svgtest___mac_rezcmd) $(__svgtest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +svgtest.app/Contents: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p svgtest.app/Contents + mkdir -p svgtest.app/Contents/MacOS + mkdir -p svgtest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/svgtest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >svgtest.app/Contents/Info.plist + + + echo -n "APPL????" >svgtest.app/Contents/PkgInfo + + + ln -f svgtest$(EXEEXT) svgtest.app/Contents/MacOS/svgtest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc svgtest.app/Contents/Resources/svgtest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns svgtest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@svgtest_bundle: svgtest.app/Contents svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples svgtest_svgtest.o: $(srcdir)/svgtest.cpp $(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $< @@ -159,4 +185,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install svgtest_bundle uninstall diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in index 69fd0a48f7..c45b79da4b 100644 --- a/samples/tab/Makefile.in +++ b/samples/tab/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TAB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) TAB_OBJECTS = \ tab_tab.o \ $(__tab___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o tab$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o tab$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -121,19 +122,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT) @COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o +@COND_PLATFORM_MACOSX_1@__tab_bundle___depname = tab_bundle ### Targets: ### -all: tab$(EXEEXT) +all: tab$(EXEEXT) $(__tab_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f tab$(EXEEXT) + rm -rf tab.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -143,12 +145,36 @@ tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc) $(CXX) -o $@ $(TAB_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__tab___mac_rezcmd) $(__tab___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +tab.app/Contents: tab$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p tab.app/Contents + mkdir -p tab.app/Contents/MacOS + mkdir -p tab.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/tab/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >tab.app/Contents/Info.plist + + + echo -n "APPL????" >tab.app/Contents/PkgInfo + + + ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc tab.app/Contents/Resources/tab.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns tab.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@tab_bundle: tab.app/Contents tab_tab.o: $(srcdir)/tab.cpp $(CXXC) -c -o $@ $(TAB_CXXFLAGS) $< tab_tab_rc.o: $(srcdir)/tab.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -156,4 +182,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install tab_bundle uninstall diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in index a1d5223078..58710b13e9 100644 --- a/samples/taskbar/Makefile.in +++ b/samples/taskbar/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TASKBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) TASKBAR_OBJECTS = \ taskbar_tbtest.o \ $(__taskbar___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o taskbar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o taskbar$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -125,19 +126,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__taskbar___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C taskbar$(EXEEXT) @COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o +@COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle ### Targets: ### -all: taskbar$(EXEEXT) +all: taskbar$(EXEEXT) $(__taskbar_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f taskbar$(EXEEXT) + rm -rf taskbar.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -147,12 +149,36 @@ taskbar$(EXEEXT): $(TASKBAR_OBJECTS) $(__taskbar___win32rc) $(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__taskbar___mac_rezcmd) $(__taskbar___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +taskbar.app/Contents: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p taskbar.app/Contents + mkdir -p taskbar.app/Contents/MacOS + mkdir -p taskbar.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/taskbar/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >taskbar.app/Contents/Info.plist + + + echo -n "APPL????" >taskbar.app/Contents/PkgInfo + + + ln -f taskbar$(EXEEXT) taskbar.app/Contents/MacOS/taskbar + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc taskbar.app/Contents/Resources/taskbar.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns taskbar.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents taskbar_tbtest.o: $(srcdir)/tbtest.cpp $(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $< taskbar_tbtest_rc.o: $(srcdir)/tbtest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -160,4 +186,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install taskbar_bundle uninstall diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in index 79667d4c7c..afbb941ada 100644 --- a/samples/text/Makefile.in +++ b/samples/text/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TEXT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) TEXT_OBJECTS = \ text_text.o \ $(__text___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o text$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o text$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__text___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C text$(EXEEXT) @COND_PLATFORM_WIN32_1@__text___win32rc = text_text_rc.o +@COND_PLATFORM_MACOSX_1@__text_bundle___depname = text_bundle ### Targets: ### -all: text$(EXEEXT) +all: text$(EXEEXT) $(__text_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f text$(EXEEXT) + rm -rf text.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ text$(EXEEXT): $(TEXT_OBJECTS) $(__text___win32rc) $(CXX) -o $@ $(TEXT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__text___mac_rezcmd) $(__text___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +text.app/Contents: text$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p text.app/Contents + mkdir -p text.app/Contents/MacOS + mkdir -p text.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/text/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >text.app/Contents/Info.plist + + + echo -n "APPL????" >text.app/Contents/PkgInfo + + + ln -f text$(EXEEXT) text.app/Contents/MacOS/text + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc text.app/Contents/Resources/text.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns text.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@text_bundle: text.app/Contents text_text.o: $(srcdir)/text.cpp $(CXXC) -c -o $@ $(TEXT_CXXFLAGS) $< text_text_rc.o: $(srcdir)/text.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install text_bundle uninstall diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in index 5917960be6..96725521d5 100644 --- a/samples/thread/Makefile.in +++ b/samples/thread/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib THREAD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) THREAD_OBJECTS = \ thread_thread.o \ $(__thread___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o thread$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o thread$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__thread___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C thread$(EXEEXT) @COND_PLATFORM_WIN32_1@__thread___win32rc = thread_thread_rc.o +@COND_PLATFORM_MACOSX_1@__thread_bundle___depname = thread_bundle ### Targets: ### -all: thread$(EXEEXT) +all: thread$(EXEEXT) $(__thread_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f thread$(EXEEXT) + rm -rf thread.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ thread$(EXEEXT): $(THREAD_OBJECTS) $(__thread___win32rc) $(CXX) -o $@ $(THREAD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__thread___mac_rezcmd) $(__thread___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +thread.app/Contents: thread$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p thread.app/Contents + mkdir -p thread.app/Contents/MacOS + mkdir -p thread.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/thread/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >thread.app/Contents/Info.plist + + + echo -n "APPL????" >thread.app/Contents/PkgInfo + + + ln -f thread$(EXEEXT) thread.app/Contents/MacOS/thread + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc thread.app/Contents/Resources/thread.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns thread.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@thread_bundle: thread.app/Contents thread_thread.o: $(srcdir)/thread.cpp $(CXXC) -c -o $@ $(THREAD_CXXFLAGS) $< thread_thread_rc.o: $(srcdir)/thread.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install thread_bundle uninstall diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index e9592df203..6f303d120e 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TOOLBAR_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) TOOLBAR_OBJECTS = \ toolbar_toolbar.o \ $(__toolbar___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o toolbar$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o toolbar$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__toolbar___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C toolbar$(EXEEXT) @COND_PLATFORM_WIN32_1@__toolbar___win32rc = toolbar_toolbar_rc.o +@COND_PLATFORM_MACOSX_1@__toolbar_bundle___depname = toolbar_bundle ### Targets: ### -all: toolbar$(EXEEXT) +all: toolbar$(EXEEXT) $(__toolbar_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f toolbar$(EXEEXT) + rm -rf toolbar.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc) $(CXX) -o $@ $(TOOLBAR_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__toolbar___mac_rezcmd) $(__toolbar___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +toolbar.app/Contents: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p toolbar.app/Contents + mkdir -p toolbar.app/Contents/MacOS + mkdir -p toolbar.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/toolbar/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >toolbar.app/Contents/Info.plist + + + echo -n "APPL????" >toolbar.app/Contents/PkgInfo + + + ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc toolbar.app/Contents/Resources/toolbar.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@toolbar_bundle: toolbar.app/Contents toolbar_toolbar.o: $(srcdir)/toolbar.cpp $(CXXC) -c -o $@ $(TOOLBAR_CXXFLAGS) $< toolbar_toolbar_rc.o: $(srcdir)/toolbar.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install toolbar_bundle uninstall diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in index 92d7e480c3..7b6abf308e 100644 --- a/samples/treectrl/Makefile.in +++ b/samples/treectrl/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TREECTRL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) TREECTRL_OBJECTS = \ treectrl_treetest.o \ $(__treectrl___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o treectrl$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o treectrl$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__treectrl___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C treectrl$(EXEEXT) @COND_PLATFORM_WIN32_1@__treectrl___win32rc = treectrl_treetest_rc.o +@COND_PLATFORM_MACOSX_1@__treectrl_bundle___depname = treectrl_bundle ### Targets: ### -all: treectrl$(EXEEXT) +all: treectrl$(EXEEXT) $(__treectrl_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f treectrl$(EXEEXT) + rm -rf treectrl.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ treectrl$(EXEEXT): $(TREECTRL_OBJECTS) $(__treectrl___win32rc) $(CXX) -o $@ $(TREECTRL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__treectrl___mac_rezcmd) $(__treectrl___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +treectrl.app/Contents: treectrl$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p treectrl.app/Contents + mkdir -p treectrl.app/Contents/MacOS + mkdir -p treectrl.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/treectrl/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >treectrl.app/Contents/Info.plist + + + echo -n "APPL????" >treectrl.app/Contents/PkgInfo + + + ln -f treectrl$(EXEEXT) treectrl.app/Contents/MacOS/treectrl + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc treectrl.app/Contents/Resources/treectrl.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns treectrl.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@treectrl_bundle: treectrl.app/Contents treectrl_treetest.o: $(srcdir)/treetest.cpp $(CXXC) -c -o $@ $(TREECTRL_CXXFLAGS) $< treectrl_treetest_rc.o: $(srcdir)/treetest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install treectrl_bundle uninstall diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 272e67539b..c40ec3bd03 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib TYPETEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) TYPETEST_OBJECTS = \ typetest_typetest.o \ $(__typetest___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o typetest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o typetest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C typetest$(EXEEXT) @COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_typetest_rc.o +@COND_PLATFORM_MACOSX_1@__typetest_bundle___depname = typetest_bundle ### Targets: ### -all: typetest$(EXEEXT) +all: typetest$(EXEEXT) $(__typetest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f typetest$(EXEEXT) + rm -rf typetest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -144,12 +146,36 @@ typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) $(CXX) -o $@ $(TYPETEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__typetest___mac_rezcmd) $(__typetest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +typetest.app/Contents: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p typetest.app/Contents + mkdir -p typetest.app/Contents/MacOS + mkdir -p typetest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/typetest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >typetest.app/Contents/Info.plist + + + echo -n "APPL????" >typetest.app/Contents/PkgInfo + + + ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc typetest.app/Contents/Resources/typetest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns typetest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@typetest_bundle: typetest.app/Contents typetest_typetest.o: $(srcdir)/typetest.cpp $(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $< typetest_typetest_rc.o: $(srcdir)/typetest.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples uninstall: @@ -157,4 +183,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install typetest_bundle uninstall diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index b386bf6f82..910462d093 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib VALIDATE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) VALIDATE_OBJECTS = \ validate_validate.o \ $(__validate___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o validate$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o validate$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__validate___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C validate$(EXEEXT) @COND_PLATFORM_WIN32_1@__validate___win32rc = validate_validate_rc.o +@COND_PLATFORM_MACOSX_1@__validate_bundle___depname = validate_bundle ### Targets: ### -all: validate$(EXEEXT) +all: validate$(EXEEXT) $(__validate_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f validate$(EXEEXT) + rm -rf validate.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,15 +148,39 @@ validate$(EXEEXT): $(VALIDATE_OBJECTS) $(__validate___win32rc) $(CXX) -o $@ $(VALIDATE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__validate___mac_rezcmd) $(__validate___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +validate.app/Contents: validate$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p validate.app/Contents + mkdir -p validate.app/Contents/MacOS + mkdir -p validate.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/validate/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >validate.app/Contents/Info.plist + + + echo -n "APPL????" >validate.app/Contents/PkgInfo + + + ln -f validate$(EXEEXT) validate.app/Contents/MacOS/validate + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc validate.app/Contents/Resources/validate.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns validate.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@validate_bundle: validate.app/Contents validate_validate.o: $(srcdir)/validate.cpp $(CXXC) -c -o $@ $(VALIDATE_CXXFLAGS) $< validate_validate_rc.o: $(srcdir)/validate.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install uninstall validate_bundle diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in index 775f6d40f8..1f603c49a3 100644 --- a/samples/vscroll/Makefile.in +++ b/samples/vscroll/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib VSTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) VSTEST_OBJECTS = \ $(__vstest___win32rc) \ vstest_vstest.o @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o vstest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o vstest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -122,19 +123,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__vstest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C vstest$(EXEEXT) @COND_PLATFORM_WIN32_1@__vstest___win32rc = vstest_sample_rc.o +@COND_PLATFORM_MACOSX_1@__vstest_bundle___depname = vstest_bundle ### Targets: ### -all: vstest$(EXEEXT) +all: vstest$(EXEEXT) $(__vstest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f vstest$(EXEEXT) + rm -rf vstest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -146,9 +148,33 @@ vstest$(EXEEXT): $(VSTEST_OBJECTS) $(__vstest___win32rc) $(CXX) -o $@ $(VSTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__vstest___mac_rezcmd) $(__vstest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +vstest.app/Contents: vstest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p vstest.app/Contents + mkdir -p vstest.app/Contents/MacOS + mkdir -p vstest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/vstest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >vstest.app/Contents/Info.plist + + + echo -n "APPL????" >vstest.app/Contents/PkgInfo + + + ln -f vstest$(EXEEXT) vstest.app/Contents/MacOS/vstest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc vstest.app/Contents/Resources/vstest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns vstest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@vstest_bundle: vstest.app/Contents vstest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples vstest_vstest.o: $(srcdir)/vstest.cpp $(CXXC) -c -o $@ $(VSTEST_CXXFLAGS) $< @@ -157,4 +183,4 @@ vstest_vstest.o: $(srcdir)/vstest.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install uninstall vstest_bundle diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in index 104edbf3d9..440c1576ab 100644 --- a/samples/widgets/Makefile.in +++ b/samples/widgets/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib WIDGETS_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) WIDGETS_OBJECTS = \ widgets_button.o \ widgets_combobox.o \ @@ -114,8 +115,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o widgets$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o widgets$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -132,19 +133,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__widgets___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C widgets$(EXEEXT) @COND_PLATFORM_WIN32_1@__widgets___win32rc = widgets_widgets_rc.o +@COND_PLATFORM_MACOSX_1@__widgets_bundle___depname = widgets_bundle ### Targets: ### -all: widgets$(EXEEXT) +all: widgets$(EXEEXT) $(__widgets_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f widgets$(EXEEXT) + rm -rf widgets.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -156,6 +158,30 @@ widgets$(EXEEXT): $(WIDGETS_OBJECTS) $(__widgets___win32rc) $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__widgets___mac_rezcmd) $(__widgets___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +widgets.app/Contents: widgets$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p widgets.app/Contents + mkdir -p widgets.app/Contents/MacOS + mkdir -p widgets.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/widgets/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >widgets.app/Contents/Info.plist + + + echo -n "APPL????" >widgets.app/Contents/PkgInfo + + + ln -f widgets$(EXEEXT) widgets.app/Contents/MacOS/widgets + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc widgets.app/Contents/Resources/widgets.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns widgets.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@widgets_bundle: widgets.app/Contents widgets_button.o: $(srcdir)/button.cpp $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< @@ -191,10 +217,10 @@ widgets_widgets.o: $(srcdir)/widgets.cpp $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $< widgets_widgets_rc.o: $(srcdir)/widgets.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install uninstall widgets_bundle diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in index 1da0593e31..646fba6a0b 100644 --- a/samples/wizard/Makefile.in +++ b/samples/wizard/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib WIZARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) WIZARD_OBJECTS = \ wizard_wizard.o \ $(__wizard___win32rc) @@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o wizard$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wizard$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) COND_MONOLITHIC_0___WXLIB_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -125,19 +126,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__wizard___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C wizard$(EXEEXT) @COND_PLATFORM_WIN32_1@__wizard___win32rc = wizard_wizard_rc.o +@COND_PLATFORM_MACOSX_1@__wizard_bundle___depname = wizard_bundle ### Targets: ### -all: wizard$(EXEEXT) +all: wizard$(EXEEXT) $(__wizard_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f wizard$(EXEEXT) + rm -rf wizard.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -149,15 +151,39 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc) $(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wizard___mac_rezcmd) $(__wizard___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +wizard.app/Contents: wizard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p wizard.app/Contents + mkdir -p wizard.app/Contents/MacOS + mkdir -p wizard.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/wizard/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >wizard.app/Contents/Info.plist + + + echo -n "APPL????" >wizard.app/Contents/PkgInfo + + + ln -f wizard$(EXEEXT) wizard.app/Contents/MacOS/wizard + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wizard.app/Contents/Resources/wizard.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns wizard.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@wizard_bundle: wizard.app/Contents wizard_wizard.o: $(srcdir)/wizard.cpp $(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $< wizard_wizard_rc.o: $(srcdir)/wizard.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install uninstall wizard_bundle diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index f629c8ea3a..ad5fec9322 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib WXTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS) WXTEST_OBJECTS = \ $(__wxtest___win32rc) \ wxtest_test.o \ @@ -105,8 +106,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../samples -o wxtest$(EXEEXT) Carbon.r \ - $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxtest$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -123,19 +124,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxtest$(EXEEXT) @COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_sample_rc.o +@COND_PLATFORM_MACOSX_1@__wxtest_bundle___depname = wxtest_bundle ### Targets: ### -all: wxtest$(EXEEXT) +all: wxtest$(EXEEXT) $(__wxtest_bundle___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f wxtest$(EXEEXT) + rm -rf wxtest.app distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -147,9 +149,33 @@ wxtest$(EXEEXT): $(WXTEST_OBJECTS) $(__wxtest___win32rc) $(CXX) -o $@ $(WXTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__wxtest___mac_rezcmd) $(__wxtest___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +wxtest.app/Contents: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p wxtest.app/Contents + mkdir -p wxtest.app/Contents/MacOS + mkdir -p wxtest.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/wxtest/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >wxtest.app/Contents/Info.plist + + + echo -n "APPL????" >wxtest.app/Contents/PkgInfo + + + ln -f wxtest$(EXEEXT) wxtest.app/Contents/MacOS/wxtest + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxtest.app/Contents/Resources/wxtest.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns wxtest.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@wxtest_bundle: wxtest.app/Contents wxtest_sample_rc.o: $(srcdir)/../../samples/sample.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples wxtest_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $< @@ -161,4 +187,4 @@ wxtest_test_wdr.o: $(srcdir)/test_wdr.cpp # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean distclean install uninstall +.PHONY: all clean distclean install uninstall wxtest_bundle diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in index 99c8be4823..bb5a0559fe 100644 --- a/samples/xrc/Makefile.in +++ b/samples/xrc/Makefile.in @@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@ LDFLAGS_GUI = @LDFLAGS_GUI@ RESCOMP = @RESCOMP@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ +SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SETFILE = @SETFILE@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLKIT = @TOOLKIT@ @@ -36,8 +37,8 @@ LIBDIRNAME = $(top_builddir)lib XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ - -I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \ - $(CXXFLAGS) + -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples \ + -I$(srcdir)/../../include $(CXXFLAGS) XRCDEMO_OBJECTS = \ xrcdemo_xrcdemo.o \ xrcdemo_myframe.o \ @@ -108,9 +109,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ - $(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \ xrcdemo$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \ - ../../../samples/sample.r + sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -132,15 +133,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_PLATFORM_MAC_1@__xrcdemo___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C xrcdemo$(EXEEXT) @COND_PLATFORM_WIN32_1@__xrcdemo___win32rc = xrcdemo_xrcdemo_rc.o +@COND_PLATFORM_MACOSX_1@__xrcdemo_bundle___depname = xrcdemo_bundle ### Targets: ### -all: xrcdemo$(EXEEXT) data +all: xrcdemo$(EXEEXT) $(__xrcdemo_bundle___depname) data clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f xrcdemo$(EXEEXT) + rm -rf xrcdemo.app data: @mkdir -p ./rc @@ -151,8 +154,7 @@ data: done distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all @@ -164,6 +166,30 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc) $(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__xrcdemo___mac_rezcmd) $(__xrcdemo___mac_setfilecmd) + $(SAMPLES_RPATH_POSTLINK) + +xrcdemo.app/Contents: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p xrcdemo.app/Contents + mkdir -p xrcdemo.app/Contents/MacOS + mkdir -p xrcdemo.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/xrcdemo/" \ + -e "s/VERSION/2.5.0/" \ + $(top_srcdir)/src/mac/Info.plist.in >xrcdemo.app/Contents/Info.plist + + + echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo + + + ln -f xrcdemo$(EXEEXT) xrcdemo.app/Contents/MacOS/xrcdemo + + + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc xrcdemo.app/Contents/Resources/xrcdemo.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns xrcdemo.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@xrcdemo_bundle: xrcdemo.app/Contents xrcdemo_custclas.o: $(srcdir)/custclas.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< @@ -178,10 +204,10 @@ xrcdemo_xrcdemo.o: $(srcdir)/xrcdemo.cpp $(CXXC) -c -o $@ $(XRCDEMO_CXXFLAGS) $< xrcdemo_xrcdemo_rc.o: $(srcdir)/xrcdemo.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install uninstall +.PHONY: all clean data distclean install uninstall xrcdemo_bundle diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in index fc0eb56866..a0129693a6 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -88,13 +88,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ all: wxrc$(EXEEXT) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f wxrc$(EXEEXT) distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all -- 2.45.2