removed stray ^Ms

[wxWidgets.git] / build / bakefiles / odbc.bkl

diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index ca2c0ca129b910cedd08fa834e2b4ad295a9668a..4c141776f186ae99f169f20ef27e93e57fe35dc7 100644 (file)
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -3,38 +3,41 @@
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_ODBC"/>
 
     <if cond="FORMAT=='autoconf'">
         <option name="wxUSE_ODBC"/>

+        <set var="LIB_ODBC">
+            <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
+        </set>

     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="wxUSE_ODBC">
             <if cond="PLATFORM_UNIX=='1'">builtin</if>
             <if cond="PLATFORM_UNIX=='0'">0</if>
         </set>
     </if>
     <if cond="FORMAT!='autoconf'">
         <set var="wxUSE_ODBC">
             <if cond="PLATFORM_UNIX=='1'">builtin</if>
             <if cond="PLATFORM_UNIX=='0'">0</if>
         </set>

+        <set var="LIB_ODBC">
+            <if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
+        </set>

     </if>
     </if>

-    <set var="LIB_ODBC">
-        <if cond="wxUSE_ODBC=='builtin'">wxodbc</if>
-    </set>

     <set var="INC_ODBC">
     <set var="INC_ODBC">

-        <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
+        <if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)src/odbc</if>

     </set>
 
     <lib id="wxodbc" template="3rdparty_lib"
          cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
     </set>
 
     <lib id="wxodbc" template="3rdparty_lib"
          cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>

-                   src/iodbc/catalog.c
+            src/iodbc/catalog.c

             src/iodbc/connect.c
             src/iodbc/connect.c

-                   src/iodbc/dlf.c
-                   src/iodbc/dlproc.c
-                   src/iodbc/execute.c
-                   src/iodbc/fetch.c
-                   src/iodbc/hdbc.c
-                   src/iodbc/henv.c
-                   src/iodbc/herr.c
-                   src/iodbc/hstmt.c
-                   src/iodbc/info.c
-                   src/iodbc/itrace.c
-                   src/iodbc/misc.c
-                   src/iodbc/prepare.c
+            src/iodbc/dlf.c
+            src/iodbc/dlproc.c
+            src/iodbc/execute.c
+            src/iodbc/fetch.c
+            src/iodbc/hdbc.c
+            src/iodbc/henv.c
+            src/iodbc/herr.c
+            src/iodbc/hstmt.c
+            src/iodbc/info.c
+            src/iodbc/itrace.c
+            src/iodbc/misc.c
+            src/iodbc/prepare.c

             src/iodbc/result.c
         </sources>
     </lib>
             src/iodbc/result.c
         </sources>
     </lib>