no real change, removed commented out code forgotten there

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 9564da605fdca5898f245d9cf0717351876d32f4..aac290e174db681d9a5105f50063287590af55c3 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -379,20 +379,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <mac_version>$(WXMACVERSION)</mac_version>
     </template>
 
-    <template id="wx_lib" template="wx_lib_b"/>
-    <template id="wx_base_lib" template="wx_lib_b"/>
-    <template id="wx_dll" template="wx_dll_b"
-                          template_append="wx_append_nomono">
-        <depends>wxtiff</depends>
-        <depends>wxjpeg</depends>
-        <depends>wxpng</depends>
-        <depends>wxexpat</depends>
-        <depends>wxzlib</depends>
-        <depends cond="FORMAT=='autoconf'">wxodbc</depends>
-        <depends>wxregex</depends>
-    </template>
-    <template id="wx_base_dll" template="wx_dll_b"
-                               template_append="wx_append_base_nomono">
+    <template id="wx_3rdparty_dependencies">
         <depends>wxtiff</depends>
         <depends>wxjpeg</depends>
         <depends>wxpng</depends>
@@ -402,6 +389,13 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
         <depends>wxregex</depends>
     </template>
     
+    <template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
+    <template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
+    <template id="wx_dll" template="wx_dll_b,wx_3rdparty_dependencies"
+                          template_append="wx_append_nomono"/>
+    <template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
+                               template_append="wx_append_base_nomono"/>
+    
     <!-- =============================================================== -->
     <!--               Support for wxWindows samples and contrib:        -->
     <!-- =============================================================== -->