Added Brian Victor's Patch

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

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index d27a1a8ab2918e5a819020d3abcf4a5c39eb08fc..2c109b9e5a244ef7d15fc9ea0c460ad95d09d7d5 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -35,10 +35,11 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### 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$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../samples $(CXXFLAGS)
+       -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)

 DBTEST_OBJECTS =  \
 DBTEST_OBJECTS =  \

+       $(__dbtest_os2_lib_res) \

        dbtest_dbtest.o \
        dbtest_listdb.o \
        $(__dbtest___win32rc)
        dbtest_dbtest.o \
        dbtest_listdb.o \
        $(__dbtest___win32rc)


@@ -105,6 +106,8 @@ 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_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: ###
 
 
 ### Targets: ###
 


@@ -141,8 +144,8 @@ dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.pl
        ln -f dbtest$(EXEEXT) dbtest.app/Contents/MacOS/dbtest
        
        
        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
 
 
 @COND_PLATFORM_MACOSX_1@dbtest_bundle: dbtest.app/Contents/PkgInfo