Removed rules for copying the Mac resource file since they are no

[wxWidgets.git] / samples / image / Makefile.in

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 301120a1983e94bc0f3ccf19bc5f50815e756999..0b85ec54de792bd8af4678acacbab565f1478708 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@

-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@

 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@


@@ -121,7 +120,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
        $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o image$(EXEEXT) Carbon.r \
        __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
        $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
        $(srcdir)/../../samples -i $(top_srcdir)/include -o image$(EXEEXT) Carbon.r \

-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       sample.r

 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -150,7 +149,7 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
        $(__image___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__image___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p image.app/Contents
        mkdir -p image.app/Contents/MacOS
        mkdir -p image.app/Contents/Resources
        mkdir -p image.app/Contents
        mkdir -p image.app/Contents/MacOS
        mkdir -p image.app/Contents/Resources


@@ -168,7 +167,6 @@ image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
        ln -f image$(EXEEXT) image.app/Contents/MacOS/image
        
        
        ln -f image$(EXEEXT) image.app/Contents/MacOS/image
        
        

-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc image.app/Contents/Resources/image.rsrc

        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@image_bundle: $(____image_BUNDLE_TGT_REF_DEP)
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@image_bundle: $(____image_BUNDLE_TGT_REF_DEP)