Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in
index 6168296bbd027315adeebdf705d1fbc255739976..a3a85d2e75852aa5fe5b2425390a29f57427dca6 100644 (file)
--- a/samples/wxtest/Makefile.in
+++ b/samples/wxtest/Makefile.in
@@ -13,11 +13,13 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -32,18 +34,21 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WXTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+WXTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 WXTEST_OBJECTS =  \
        $(__wxtest___win32rc) \
+       $(__wxtest_os2_lib_res) \
        wxtest_test.o \
        wxtest_test_wdr.o
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -72,9 +77,9 @@ WX_VERSION = 2.5.0
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
-       $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxtest Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o wxtest$(EXEEXT) Carbon.r \
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -88,18 +93,24 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest
+@COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -a C wxtest$(EXEEXT)
+COND_PLATFORM_OS2_1___wxtest___os2_emxbindcmd = $(NM) wxtest$(EXEEXT) | if grep \
+       -q pmwin.763 ; then emxbind -ep wxtest$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__wxtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxtest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_sample_rc.o
 @COND_PLATFORM_MACOSX_1@__wxtest_bundle___depname = wxtest_bundle
+@COND_PLATFORM_OS2_1@__wxtest_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
-all: wxtest $(__wxtest_bundle___depname)
+all: wxtest$(EXEEXT) $(__wxtest_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f wxtest
+       rm -f wxtest$(EXEEXT)
        rm -rf wxtest.app
 
 distclean: clean
@@ -111,13 +122,14 @@ install-strip: install
 
 uninstall: 
 
-wxtest: $(WXTEST_OBJECTS) $(__wxtest___win32rc)
-       $(CXX) -o $@ $(WXTEST_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)
+wxtest$(EXEEXT): $(WXTEST_OBJECTS) $(__wxtest___win32rc)
+       $(CXX) -o $@ $(WXTEST_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)
        $(__wxtest___mac_rezcmd)
        $(__wxtest___mac_setfilecmd)
+       $(__wxtest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-wxtest.app/Contents: wxtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+wxtest.app/Contents/PkgInfo: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p wxtest.app/Contents
        mkdir -p wxtest.app/Contents/MacOS
        mkdir -p wxtest.app/Contents/Resources
@@ -132,22 +144,22 @@ wxtest.app/Contents: wxtest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/li
        echo -n "APPL????" >wxtest.app/Contents/PkgInfo
        
        
-       ln -f wxtest wxtest.app/Contents/MacOS/wxtest
+       ln -f wxtest$(EXEEXT) wxtest.app/Contents/MacOS/wxtest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxtest.app/Contents/Resources/wxtest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns wxtest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc wxtest.app/Contents/Resources/wxtest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns wxtest.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@wxtest_bundle: wxtest.app/Contents
+@COND_PLATFORM_MACOSX_1@wxtest_bundle: wxtest.app/Contents/PkgInfo
 
 wxtest_sample_rc.o: $(srcdir)/../../samples/sample.rc
-       $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+       $(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 wxtest_test.o: $(srcdir)/test.cpp
-       $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $<
 
 wxtest_test_wdr.o: $(srcdir)/test_wdr.cpp
-       $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $<
 
 
 # Include dependency info, if present: