compilation fix after last commit

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

diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index f15082c8f2c6a250ef6cc51c2ec897649bbe0c11..2aff096a9e12aa0a180b2f3e15a76c82eeb3cf07 100644 (file)
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -9,6 +9,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
 WINDRES = @WINDRES@
@@ -68,6 +69,7 @@ TEST_OBJECTS =  \
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
 @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
+@COND_PLATFORM_MAC_0@__test___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C test$(EXEEXT)
 @COND_PLATFORM_MAC_1@__test___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -95,9 +97,13 @@ COND_PLATFORM_OS2_1___test___os2_emxbindcmd = $(NM) test$(EXEEXT) | if grep -q \
 @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__test_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__test_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@       = test.app/Contents/PkgInfo
 @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_TOOLKIT_COCOA@____test_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@   $(__test_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____test_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@     $(__test_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_HTML_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -125,8 +131,6 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
        -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@@ -159,31 +163,31 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
-       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+       $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
        $(__test___mac_rezcmd)
        $(__test___mac_setfilecmd)
        $(__test___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-       mkdir -p test.app/Contents
-       mkdir -p test.app/Contents/MacOS
-       mkdir -p test.app/Contents/Resources
-       
-       
-       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/carbon/Info.plist.in >test.app/Contents/Info.plist
-       
-       
-       echo -n "APPL????" >test.app/Contents/PkgInfo
-       
-       
-       ln -f test$(EXEEXT) test.app/Contents/MacOS/test
-       
-       
-       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents
+@COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@       mkdir -p test.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/test/" \
+@COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >test.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >test.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       ln -f test$(EXEEXT) test.app/Contents/MacOS/test
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns test.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@test_bundle: $(____test_BUNDLE_TGT_REF_DEP)