demonstrate tab order

[wxWidgets.git] / samples / html / test / Makefile.in

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 2cae7d0c0496d61e0234b0e7e05992d1502303f2..abf82ead288e9cbc480ab9e03dedf68f3f09d500 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
 ### Variables: ###
 
 DESTDIR = 

-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2

 LIBDIRNAME = $(top_builddir)lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
 LIBDIRNAME = $(top_builddir)lib
 TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
        $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)


@@ -71,6 +71,8 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__test_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle
 @COND_PLATFORM_OS2_1@__test_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__test_bundle___depname = test_bundle

+@COND_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = test.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = test.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)
 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)


@@ -105,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 test$(EXEEXT) Carbon.r \
 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 test$(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: ###
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###


@@ -134,7 +136,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
        $(__test___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__test___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns

        mkdir -p test.app/Contents
        mkdir -p test.app/Contents/MacOS
        mkdir -p test.app/Contents/Resources
        mkdir -p test.app/Contents
        mkdir -p test.app/Contents/MacOS
        mkdir -p test.app/Contents/Resources


@@ -143,7 +145,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/test/" \
        -e "s/VERSION/$(WX_VERSION)/" \
        sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
        -e "s/EXECUTABLE/test/" \
        -e "s/VERSION/$(WX_VERSION)/" \

-       $(top_srcdir)/src/mac/Info.plist.in >test.app/Contents/Info.plist
+       $(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist

        
        
        echo -n "APPL????" >test.app/Contents/PkgInfo
        
        
        echo -n "APPL????" >test.app/Contents/PkgInfo


@@ -152,14 +154,14 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
        ln -f test$(EXEEXT) test.app/Contents/MacOS/test
        
        
        ln -f test$(EXEEXT) test.app/Contents/MacOS/test
        
        

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

 
 

-@COND_PLATFORM_MACOSX_1@test_bundle: test.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)

 
 data: 
        @mkdir -p .
 
 data: 
        @mkdir -p .

-       @for f in f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm; do \
+       @for f in f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm; do \

        if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
        cp -pRf $(srcdir)/$$f . ; \
        fi; \
        if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
        cp -pRf $(srcdir)/$$f . ; \
        fi; \