Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index 5ec530217a2b6e6f7a8b5f3bed870b9d843aab6e..ab7d98a2601f43a908d79b0c6c646c84e32a455a 100644 (file)
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -34,11 +34,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+DESTDIR = 

 LIBDIRNAME = $(top_builddir)lib
 LIBDIRNAME = $(top_builddir)lib

-MENU_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 MENU_OBJECTS =  \
 MENU_OBJECTS =  \

+       $(__menu_os2_lib_res) \

        menu_menu.o \
        $(__menu___win32rc)
 WX_VERSION = 2.5.1
        menu_menu.o \
        $(__menu___win32rc)
 WX_VERSION = 2.5.1


@@ -75,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 \
 @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 menu$(EXEEXT) Carbon.r \
+       __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
+       $(srcdir)/../../samples -o menu$(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 = \
        $(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 = \


@@ -98,6 +99,8 @@ COND_PLATFORM_OS2_1___menu___os2_emxbindcmd = $(NM) menu$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__menu___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___menu___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_menu_rc.o
 @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle
 @COND_PLATFORM_OS2_1@__menu___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___menu___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__menu___win32rc = menu_menu_rc.o
 @COND_PLATFORM_MACOSX_1@__menu_bundle___depname = menu_bundle

+@COND_PLATFORM_OS2_1@__menu_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

 
 ### Targets: ###
 
 
 ### Targets: ###
 


@@ -141,8 +144,8 @@ menu.app/Contents/PkgInfo: menu$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
        
        
        ln -f menu$(EXEEXT) menu.app/Contents/MacOS/menu
        
        

-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc menu.app/Contents/Resources/menu.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns menu.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc menu.app/Contents/Resources/menu.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns menu.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@menu_bundle: menu.app/Contents/PkgInfo
 
 
 @COND_PLATFORM_MACOSX_1@menu_bundle: menu.app/Contents/PkgInfo
 


@@ -150,7 +153,7 @@ menu_menu.o: $(srcdir)/menu.cpp
        $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $<
 
 menu_menu_rc.o: $(srcdir)/menu.rc
        $(CXXC) -c -o $@ $(MENU_CXXFLAGS) $<
 
 menu_menu_rc.o: $(srcdir)/menu.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

 
 uninstall: 
 
 
 uninstall: