implemented wxTE_RIGHT, wxTE_CENTRE for wxGTK2 (patch 957687)

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

diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index 6d9476a56cfdc9bbed4ebd3455440a193227082e..9ae4acd0938b9c34792c77a958feb38f713bc94d 100644 (file)
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -71,6 +71,10 @@ COND_PLATFORM_OS2_1___htlbox___os2_emxbindcmd = $(NM) htlbox$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__htlbox_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__htlbox_bundle___depname = htlbox_bundle
+@COND_TOOLKIT_COCOA@____htlbox_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   htlbox.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____htlbox_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     htlbox.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -103,7 +107,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 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 -i $(top_srcdir)/include -o htlbox$(EXEEXT) Carbon.r \
-       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+       $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -132,7 +136,7 @@ htlbox$(EXEEXT): $(HTLBOX_OBJECTS) $(__htlbox___win32rc)
        $(__htlbox___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
        mkdir -p htlbox.app/Contents
        mkdir -p htlbox.app/Contents/MacOS
        mkdir -p htlbox.app/Contents/Resources
@@ -150,10 +154,10 @@ htlbox.app/Contents/PkgInfo: htlbox$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
        ln -f htlbox$(EXEEXT) htlbox.app/Contents/MacOS/htlbox
        
        
-       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc htlbox.app/Contents/Resources/htlbox.rsrc
-       ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
+       cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc htlbox.app/Contents/Resources/htlbox.rsrc
+       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htlbox.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@htlbox_bundle: htlbox.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@htlbox_bundle: $(____htlbox_BUNDLE_TGT_REF_DEP)
 
 htlbox_htlbox.o: $(srcdir)/htlbox.cpp
        $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $<