Extension fix for multiversion installs, and allow copying of files across devices...

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

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index ec6ba533daff2faca7f4e62cf8df551171faf87e..dc039f4cd1f49b0be3857adc33485b0b7c18bc36 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -26,7 +26,6 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -122,7 +121,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 internat$(EXEEXT) \
-       Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -151,7 +150,7 @@ internat$(EXEEXT): $(INTERNAT_OBJECTS) $(__internat___win32rc)
        $(__internat___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p internat.app/Contents
        mkdir -p internat.app/Contents/MacOS
        mkdir -p internat.app/Contents/Resources
@@ -169,7 +168,6 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
        ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
        
        
-       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc internat.app/Contents/Resources/internat.rsrc
        cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP)
@@ -177,7 +175,7 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/carbon/In
 bg: 
        @mkdir -p ./bg
        @for f in internat.po internat.mo; do \
-       if test ! -e ./bg/$$f ; \
+       if test ! -f ./bg/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/bg/$$f -newer ./bg/$$f -print` ; \
        fi; \
@@ -189,7 +187,7 @@ bg:
 cs: 
        @mkdir -p ./cs
        @for f in internat.po internat.mo; do \
-       if test ! -e ./cs/$$f ; \
+       if test ! -f ./cs/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/cs/$$f -newer ./cs/$$f -print` ; \
        fi; \
@@ -201,7 +199,7 @@ cs:
 de: 
        @mkdir -p ./de
        @for f in internat.po internat.mo; do \
-       if test ! -e ./de/$$f ; \
+       if test ! -f ./de/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/de/$$f -newer ./de/$$f -print` ; \
        fi; \
@@ -213,7 +211,7 @@ de:
 fr: 
        @mkdir -p ./fr
        @for f in internat.po internat.mo; do \
-       if test ! -e ./fr/$$f ; \
+       if test ! -f ./fr/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/fr/$$f -newer ./fr/$$f -print` ; \
        fi; \
@@ -225,7 +223,7 @@ fr:
 ja: 
        @mkdir -p ./ja
        @for f in internat.po internat.mo; do \
-       if test ! -e ./ja/$$f ; \
+       if test ! -f ./ja/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/ja/$$f -newer ./ja/$$f -print` ; \
        fi; \
@@ -237,7 +235,7 @@ ja:
 ka: 
        @mkdir -p ./ka
        @for f in internat.po internat.mo; do \
-       if test ! -e ./ka/$$f ; \
+       if test ! -f ./ka/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/ka/$$f -newer ./ka/$$f -print` ; \
        fi; \
@@ -249,7 +247,7 @@ ka:
 pl: 
        @mkdir -p ./pl
        @for f in internat.po internat.mo; do \
-       if test ! -e ./pl/$$f ; \
+       if test ! -f ./pl/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/pl/$$f -newer ./pl/$$f -print` ; \
        fi; \
@@ -261,7 +259,7 @@ pl:
 ru: 
        @mkdir -p ./ru
        @for f in internat.po internat.mo; do \
-       if test ! -e ./ru/$$f ; \
+       if test ! -f ./ru/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/ru/$$f -newer ./ru/$$f -print` ; \
        fi; \