X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..4a851b11c2226c769037e5487a878e280f12e3ba:/samples/internat/Makefile.in

diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 19a2d4dfa4..39d7f1f653 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,7 +11,8 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
-RESCOMP = @RESCOMP@
+WINDRES = @WINDRES@
+REZ = @REZ@
 SETFILE = @SETFILE@
 NM = @NM@
 srcdir = @srcdir@
@@ -22,10 +23,11 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -35,10 +37,12 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_RELEASE = 2.7
+WX_VERSION = $(WX_RELEASE).0
 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 \
@@ -55,56 +59,80 @@ INTERNAT_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_1@__internat___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C internat$(EXEEXT)
 @COND_PLATFORM_MAC_1@__internat___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @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
 COND_PLATFORM_OS2_1___internat___os2_emxbindcmd = $(NM) internat$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep internat$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__internat___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___internat___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__internat_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__internat_bundle___depname = internat_bundle
+@COND_TOOLKIT_COCOA@____internat_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	internat.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____internat_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	internat.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 @COND_PLATFORM_WIN32_1@__internat___win32rc = internat_internat_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(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 \
-	$(srcdir)/../../samples -o internat$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -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 $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
+	internat$(EXEEXT) 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 ru
+all: internat$(EXEEXT) $(__internat_bundle___depname) bg cs de fr ka pl ru sv ja ja_JP.EUC-JP
 
 install: all
 
@@ -119,16 +147,16 @@ clean:
 	rm -rf internat.app
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 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)
+	$(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_FOR_BASE) $(EXTRALIBS_FOR_GUI)
 	$(__internat___mac_rezcmd)
 	$(__internat___mac_setfilecmd)
 	$(__internat___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/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
@@ -137,7 +165,7 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/internat/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >internat.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >internat.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >internat.app/Contents/PkgInfo
@@ -146,75 +174,138 @@ internat.app/Contents/PkgInfo: internat$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
 	ln -f internat$(EXEEXT) internat.app/Contents/MacOS/internat
 	
 	
-	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc internat.app/Contents/Resources/internat.rsrc
-	ln -sf $(top_srcdir)/src/mac/wxmac.icns internat.app/Contents/Resources/wxmac.icns
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns internat.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@internat_bundle: internat.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@internat_bundle: $(____internat_BUNDLE_TGT_REF_DEP)
 
 bg: 
 	@mkdir -p ./bg
 	@for f in internat.po internat.mo; do \
-	if test \( ! -s ./bg/$$f \) -o \( $(srcdir)/bg/$$f -nt ./bg/$$f  \) ; then \
-	cp -pRf $(srcdir)/bg/$$f ./bg ; \
+	if test ! -f ./bg/$$f -a ! -d ./bg/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/bg/$$f -newer ./bg/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/bg/$$f ./bg ;; \
+	esac; \
 	done
 
 cs: 
 	@mkdir -p ./cs
 	@for f in internat.po internat.mo; do \
-	if test \( ! -s ./cs/$$f \) -o \( $(srcdir)/cs/$$f -nt ./cs/$$f  \) ; then \
-	cp -pRf $(srcdir)/cs/$$f ./cs ; \
+	if test ! -f ./cs/$$f -a ! -d ./cs/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/cs/$$f -newer ./cs/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/cs/$$f ./cs ;; \
+	esac; \
 	done
 
 de: 
 	@mkdir -p ./de
 	@for f in internat.po internat.mo; do \
-	if test \( ! -s ./de/$$f \) -o \( $(srcdir)/de/$$f -nt ./de/$$f  \) ; then \
-	cp -pRf $(srcdir)/de/$$f ./de ; \
+	if test ! -f ./de/$$f -a ! -d ./de/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/de/$$f -newer ./de/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/de/$$f ./de ;; \
+	esac; \
 	done
 
 fr: 
 	@mkdir -p ./fr
 	@for f in internat.po internat.mo; do \
-	if test \( ! -s ./fr/$$f \) -o \( $(srcdir)/fr/$$f -nt ./fr/$$f  \) ; then \
-	cp -pRf $(srcdir)/fr/$$f ./fr ; \
+	if test ! -f ./fr/$$f -a ! -d ./fr/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/fr/$$f -newer ./fr/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/fr/$$f ./fr ;; \
+	esac; \
 	done
 
-ja: 
-	@mkdir -p ./ja
+ka: 
+	@mkdir -p ./ka
 	@for f in internat.po internat.mo; do \
-	if test \( ! -s ./ja/$$f \) -o \( $(srcdir)/ja/$$f -nt ./ja/$$f  \) ; then \
-	cp -pRf $(srcdir)/ja/$$f ./ja ; \
+	if test ! -f ./ka/$$f -a ! -d ./ka/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ka/$$f -newer ./ka/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ka/$$f ./ka ;; \
+	esac; \
 	done
 
-ka: 
-	@mkdir -p ./ka
+pl: 
+	@mkdir -p ./pl
 	@for f in internat.po internat.mo; do \
-	if test \( ! -s ./ka/$$f \) -o \( $(srcdir)/ka/$$f -nt ./ka/$$f  \) ; then \
-	cp -pRf $(srcdir)/ka/$$f ./ka ; \
+	if test ! -f ./pl/$$f -a ! -d ./pl/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/pl/$$f -newer ./pl/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/pl/$$f ./pl ;; \
+	esac; \
 	done
 
 ru: 
 	@mkdir -p ./ru
 	@for f in internat.po internat.mo; do \
-	if test \( ! -s ./ru/$$f \) -o \( $(srcdir)/ru/$$f -nt ./ru/$$f  \) ; then \
-	cp -pRf $(srcdir)/ru/$$f ./ru ; \
+	if test ! -f ./ru/$$f -a ! -d ./ru/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ru/$$f -newer ./ru/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ru/$$f ./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
+
+ja: 
+	@mkdir -p ./ja
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./ja/$$f -a ! -d ./ja/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ja/$$f -newer ./ja/$$f -print` ; \
+	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ja/$$f ./ja ;; \
+	esac; \
+	done
+
+ja_JP.EUC-JP: 
+	@mkdir -p ./ja_JP.EUC-JP
+	@for f in internat.po internat.mo; do \
+	if test ! -f ./ja_JP.EUC-JP/$$f -a ! -d ./ja_JP.EUC-JP/$$f ; \
+	then x=yep ; \
+	else x=`find $(srcdir)/ja_JP.EUC-JP/$$f -newer ./ja_JP.EUC-JP/$$f -print` ; \
 	fi; \
+	case "$$x" in ?*) \
+	cp -pRf $(srcdir)/ja_JP.EUC-JP/$$f ./ja_JP.EUC-JP ;; \
+	esac; \
 	done
 
 internat_internat.o: $(srcdir)/internat.cpp
-	$(CXXC) -c -o $@ $(INTERNAT_CXXFLAGS) $<
+	$(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
+	$(WINDRES) -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 $(__RCDEFDIR_p_1) --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 ru
+.PHONY: all install uninstall clean distclean internat_bundle bg cs de fr ka pl ru sv ja ja_JP.EUC-JP