Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index 9abc0ba51b76686b514138fd8223ed8b70129b9b..e401a3677eaeb097358a564bcc5c0e1a964f72a3 100644 (file)
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -35,10 +35,10 @@ top_srcdir = @top_srcdir@
 ### Variables: ###
 
 DESTDIR = 
-IMAGE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
+       $(__image_os2_lib_res) \
        image_image.o \
        $(__image___win32rc)
 LIBDIRNAME = $(top_builddir)lib
@@ -76,8 +76,8 @@ WX_VERSION = 2.5.1
 @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 image$(EXEEXT) Carbon.r \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o image$(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 = \
@@ -99,6 +99,8 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q
 @COND_PLATFORM_OS2_1@__image___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___image___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__image___win32rc = image_image_rc.o
 @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle
+@COND_PLATFORM_OS2_1@__image_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -146,8 +148,8 @@ image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
        ln -f image$(EXEEXT) image.app/Contents/MacOS/image
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc image.app/Contents/Resources/image.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns image.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc image.app/Contents/Resources/image.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns image.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@image_bundle: image.app/Contents/PkgInfo
 
@@ -155,7 +157,7 @@ image_image.o: $(srcdir)/image.cpp
        $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $<
 
 image_image_rc.o: $(srcdir)/image.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
 
 install: all