don't create conversion objects unless we really need to convert

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

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 4fa766b0d1297af8bdf5db50087fab7937932925..dd9aa6008c451db6185da4b4c8c8503e54ed6496 100644 (file)
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.7 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -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@
@@ -36,11 +35,12 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_RELEASE = 2.5
-WX_VERSION = $(WX_RELEASE).4
+WX_RELEASE = 2.6
+WX_VERSION = $(WX_RELEASE).2
 LIBDIRNAME = $(top_builddir)lib
-INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
-       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
+INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 INTERNAT_OBJECTS =  \
        $(__internat_os2_lib_res) \
        internat_internat.o \
@@ -67,6 +67,15 @@ INTERNAT_OBJECTS =  \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = -d wxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = -d wxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = -d wxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
@@ -109,14 +118,15 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       __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).4.r sample.r
+       Carbon.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
 
-all: internat$(EXEEXT) $(__internat_bundle___depname) bg cs de fr ja ka pl ru
+all: internat$(EXEEXT) $(__internat_bundle___depname) bg cs de fr ja ka pl ru sv
 
 install: all
 
@@ -140,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).4.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
@@ -158,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).4.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)
@@ -166,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 -a ! -d ./bg/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/bg/$$f -newer ./bg/$$f -print` ; \
        fi; \
@@ -178,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 -a ! -d ./cs/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/cs/$$f -newer ./cs/$$f -print` ; \
        fi; \
@@ -190,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 -a ! -d ./de/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/de/$$f -newer ./de/$$f -print` ; \
        fi; \
@@ -202,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 -a ! -d ./fr/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/fr/$$f -newer ./fr/$$f -print` ; \
        fi; \
@@ -214,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 -a ! -d ./ja/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/ja/$$f -newer ./ja/$$f -print` ; \
        fi; \
@@ -226,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 -a ! -d ./ka/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/ka/$$f -newer ./ka/$$f -print` ; \
        fi; \
@@ -238,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 -a ! -d ./pl/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/pl/$$f -newer ./pl/$$f -print` ; \
        fi; \
@@ -250,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 -a ! -d ./ru/$$f ; \
        then x=yep ; \
        else x=`find $(srcdir)/ru/$$f -newer ./ru/$$f -print` ; \
        fi; \
@@ -259,14 +268,26 @@ ru:
        esac; \
        done
 
+sv: 
+       @mkdir -p ./sv
+       @for f in internat.po internat.mo; do \
+       if test ! -f ./sv/$$f -a ! -d ./sv/$$f ; \
+       then x=yep ; \
+       else x=`find $(srcdir)/sv/$$f -newer ./sv/$$f -print` ; \
+       fi; \
+       case "$$x" in ?*) \
+       cp -pRf $(srcdir)/sv/$$f ./sv ;; \
+       esac; \
+       done
+
 internat_internat.o: $(srcdir)/internat.cpp
        $(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $(srcdir)/internat.cpp
 
 internat_internat_rc.o: $(srcdir)/internat.rc
-       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+       $(RESCOMP) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean internat_bundle bg cs de fr ja ka pl ru
+.PHONY: all install uninstall clean distclean internat_bundle bg cs de fr ja ka pl ru sv