- 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/PkgInfo
-
-display_display.o: $(srcdir)/display.cpp
- $(CXXC) -c -o $@ $(DISPLAY_CXXFLAGS) $<
+ $(__display___mac_setfilecmd)
+ $(__display___os2_emxbindcmd)
+
+@COND_PLATFORM_MACOSX_1@display.app/Contents/PkgInfo: display$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@ mkdir -p display.app/Contents
+@COND_PLATFORM_MACOSX_1@ mkdir -p display.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@ mkdir -p display.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/display/" \
+@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >display.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >display.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ ln -f display$(EXEEXT) display.app/Contents/MacOS/display
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns display.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@display_bundle: $(____display_BUNDLE_TGT_REF_DEP)