compile db sample conditionally only if odbc support was built

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/db/Makefile.in b/samples/db/Makefile.in
index 913b66b6702dba80ba702748cae097b59cb93735..d27a1a8ab2918e5a819020d3abcf4a5c39eb08fc 100644 (file)
--- a/samples/db/Makefile.in
+++ b/samples/db/Makefile.in
@@ -96,6 +96,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)
@@ -107,7 +108,7 @@ COND_PLATFORM_OS2_1___dbtest___os2_emxbindcmd = $(NM) dbtest$(EXEEXT) | if grep
 
 ### Targets: ###
 
-all: dbtest$(EXEEXT) $(__dbtest_bundle___depname)
+all: $(__dbtest___depname) $(__dbtest_bundle___depname)
 
 clean: 
        rm -rf ./.deps ./.pch
@@ -115,14 +116,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

diff --git a/samples/db/db.bkl b/samples/db/db.bkl
index 4160fd7ef5d6f63f0fa3d089b9372405c2d745c5..e50d84256e1723292a983cfda7c2d8260f8713c3 100644 (file)
--- a/samples/db/db.bkl
+++ b/samples/db/db.bkl
@@ -3,7 +3,9 @@
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
-    <exe id="dbtest" template="wx_sample" template_append="wx_append">
+    <exe id="dbtest" 
+         cond="USE_ODBC=='1'"
+         template="wx_sample" template_append="wx_append">
         <sources>dbtest.cpp listdb.cpp</sources>
         <wx-lib>odbc</wx-lib>
         <wx-lib>core</wx-lib>

diff --git a/samples/db/makefile.bcc b/samples/db/makefile.bcc
index 84cfe86133c0a2eb6160ccb1a41e08041b1aa43b..57b0c9fbe339cd24a9a1197e22d74b4f816416a4 100644 (file)
--- a/samples/db/makefile.bcc
+++ b/samples/db/makefile.bcc
@@ -147,6 +147,9 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
+!if "$(USE_ODBC)" == "1"
+__dbtest___depname = $(OBJS)\dbtest.exe
+!endif
 
 
 all: $(OBJS)
@@ -155,7 +158,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\dbtest.exe
+all: $(__dbtest___depname)
 
 $(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
        $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $**
@@ -176,7 +179,9 @@ clean:
        -if exist $(OBJS)\dbtest.ilf del $(OBJS)\dbtest.ilf
        -if exist $(OBJS)\dbtest.ils del $(OBJS)\dbtest.ils
 
+!if "$(USE_ODBC)" == "1"
 $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS)  $(OBJS)\dbtest_dbtest.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
        c0w32.obj $(DBTEST_OBJECTS),$@,, $(__WXLIB_ODBC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\dbtest_dbtest.res
 |
+!endif

diff --git a/samples/db/makefile.gcc b/samples/db/makefile.gcc
index 7b962095bff3e26f94d2d58aa7116d60d4251519..06458a495d208fc866d994bf431087804b27497a 100644 (file)
--- a/samples/db/makefile.gcc
+++ b/samples/db/makefile.gcc
@@ -154,6 +154,9 @@ endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
+ifeq ($(USE_ODBC),1)
+__dbtest___depname = $(OBJS)\dbtest.exe
+endif
 
 
 all: $(OBJS)
@@ -162,7 +165,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\dbtest.exe
+all: $(__dbtest___depname)
 
 $(OBJS)\dbtest_dbtest.o: ./dbtest.cpp
        $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $<
@@ -177,7 +180,9 @@ clean:
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe
 
+ifeq ($(USE_ODBC),1)
 $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest_rc.o
        $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_ODBC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+endif
 
 .PHONY: all clean

diff --git a/samples/db/makefile.vc b/samples/db/makefile.vc
index b993f4ff69a1b8fcd592b30ee960a153caf08484..382cbb70ab445f069cbee064c68c9ee02e780223 100644 (file)
--- a/samples/db/makefile.vc
+++ b/samples/db/makefile.vc
@@ -235,6 +235,9 @@ ____DEBUGRUNTIME_2_p_1 = /d _DEBUG
 !if "$(DEBUG_RUNTIME_LIBS)" == "default"
 ____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1)
 !endif
+!if "$(USE_ODBC)" == "1"
+__dbtest___depname = $(OBJS)\dbtest.exe
+!endif
 
 
 all: $(OBJS)
@@ -243,7 +246,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\dbtest.exe
+all: $(__dbtest___depname)
 
 $(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
@@ -261,7 +264,9 @@ clean:
        -if exist $(OBJS)\dbtest.ilk del $(OBJS)\dbtest.ilk
        -if exist $(OBJS)\dbtest.pdb del $(OBJS)\dbtest.pdb
 
+!if "$(USE_ODBC)" == "1"
 $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
        $(DBTEST_OBJECTS)  $(__WXLIB_ODBC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
 <<
+!endif

diff --git a/samples/db/makefile.wat b/samples/db/makefile.wat
index b3220b550c05ef4f7ff51c6f129266e8112f4c56..efcb2255d3d8fd96824e3d8fe3232a9ce19d545b 100644 (file)
--- a/samples/db/makefile.wat
+++ b/samples/db/makefile.wat
@@ -168,6 +168,10 @@ __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
+__dbtest___depname =
+!ifeq USE_ODBC 1
+__dbtest___depname = $(OBJS)\dbtest.exe
+!endif
 
 ### Variables: ###
 
@@ -190,7 +194,7 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\dbtest.exe
+all : .SYMBOLIC $(__dbtest___depname)
 
 $(OBJS)\dbtest_dbtest.obj :  .AUTODEPEND .\dbtest.cpp
        $(CXX) -zq -fo=$^@ $(DBTEST_CXXFLAGS) $<
@@ -208,6 +212,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe
 
+!ifeq USE_ODBC 1
 $(OBJS)\dbtest.exe :  $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
        @%create $(OBJS)\dbtest.lbc
        @%append $(OBJS)\dbtest.lbc option quiet
@@ -218,3 +223,4 @@ $(OBJS)\dbtest.exe :  $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
        @for %i in ( $(__WXLIB_ODBC_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\dbtest.lbc library %i
        @%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res
        wlink @$(OBJS)\dbtest.lbc
+!endif