Applied patch [ 817734 ] fix for cvs head with wxUSE_STD_IOSTREAM=1

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

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index 913b66b6702dba80ba702748cae097b59cb93735..2c109b9e5a244ef7d15fc9ea0c460ad95d09d7d5 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -35,10 +35,11 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-DBTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DBTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 DBTEST_OBJECTS =  \
+       $(__dbtest_os2_lib_res) \
        dbtest_dbtest.o \
        dbtest_listdb.o \
        $(__dbtest___win32rc)
@@ -96,6 +97,7 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_USE_ODBC_1@__dbtest___depname = dbtest$(EXEEXT)
 @COND_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C dbtest$(EXEEXT)
@@ -104,10 +106,12 @@ COND_PLATFORM_OS2_1___dbtest___os2_emxbindcmd = $(NM) dbtest$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__dbtest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dbtest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__dbtest___win32rc = dbtest_dbtest_rc.o
 @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
 
 ### Targets: ###
 
-all: dbtest$(EXEEXT) $(__dbtest_bundle___depname)
+all: $(__dbtest___depname) $(__dbtest_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
@@ -115,14 +119,14 @@ clean:
        rm -f dbtest$(EXEEXT)
        rm -rf dbtest.app
 
-dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
-       $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
-       $(__dbtest___mac_rezcmd)
-       $(__dbtest___mac_setfilecmd)
-       $(__dbtest___os2_emxbindcmd)
-       $(SAMPLES_RPATH_POSTLINK)
+@COND_USE_ODBC_1@dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
+@COND_USE_ODBC_1@      $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_USE_ODBC_1@      $(__dbtest___mac_rezcmd)
+@COND_USE_ODBC_1@      $(__dbtest___mac_setfilecmd)
+@COND_USE_ODBC_1@      $(__dbtest___os2_emxbindcmd)
+@COND_USE_ODBC_1@      $(SAMPLES_RPATH_POSTLINK)
 
-dbtest.app/Contents/PkgInfo: dbtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p dbtest.app/Contents
        mkdir -p dbtest.app/Contents/MacOS
        mkdir -p dbtest.app/Contents/Resources
@@ -140,8 +144,8 @@ dbtest.app/Contents/PkgInfo: dbtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
        ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dbtest.app/Contents/Resources/dbtest.rsrc
-       ln -f $(top_srcdir)/src/mac/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns
+       ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dbtest.app/Contents/Resources/dbtest.rsrc
+       ln -sf $(top_srcdir)/src/mac/wxmac.icns dbtest.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dbtest_bundle: dbtest.app/Contents/PkgInfo