Applied patch [ 892511 ] wxUniversal: fix of segfault in toolbar.cpp

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

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index a0e996b34461d6888ef49384df26916b58909edf..8bc6c4c8d87932a27517f702267444e1092c33a1 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -73,9 +73,9 @@ COND_PLATFORM_OS2_1___dbtest___os2_emxbindcmd = $(NM) dbtest$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__dbtest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__dbtest_bundle___depname = dbtest_bundle
 @COND_PLATFORM_OS2_1@__dbtest_os2_lib_res = \
 @COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__dbtest_bundle___depname = dbtest_bundle

-COND_MONOLITHIC_0___WXLIB_ODBC_p = \
+COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p = \

        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)

-@COND_MONOLITHIC_0@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0___WXLIB_ODBC_p)
+@COND_MONOLITHIC_0_USE_ODBC_1@__WXLIB_ODBC_p = $(COND_MONOLITHIC_0_USE_ODBC_1___WXLIB_ODBC_p)

 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)