Remove wxHtml and wxXml dependency from wxAdv

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 636c27eb9dec576c31ac9732f0371475aef0a690..185506385565bd2d0fa4464948dc80c79ec90b26 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -40,7 +40,7 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>

-        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL']">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">../../samples</dir>

     </subproject>
 
     <if cond="FORMAT=='autoconf'">
     </subproject>
 
     <if cond="FORMAT=='autoconf'">


@@ -61,20 +61,20 @@
             <depends>xmllib</depends>
 
             <command>
             <depends>xmllib</depends>
 
             <command>

-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all ; fi)

             </command>
         </action>
         <action id="clean-wxrc" cond="USE_XRC=='1'">
             <dependency-of>clean</dependency-of>
             <command>
             </command>
         </action>
         <action id="clean-wxrc" cond="USE_XRC=='1'">
             <dependency-of>clean</dependency-of>
             <command>

-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) clean ; fi)

             </command>
         </action>
         <action id="install-wxrc" cond="USE_XRC=='1'">
             <dependency-of>install</dependency-of>
             <depends>wxrc</depends>
             <command>
             </command>
         </action>
         <action id="install-wxrc" cond="USE_XRC=='1'">
             <dependency-of>install</dependency-of>
             <depends>wxrc</depends>
             <command>

-                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
+                (if test -d utils/wxrc ; then cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install ; fi)

             </command>
         </action>
 
             </command>
         </action>
 


@@ -101,11 +101,20 @@
             </command>
         </action>
 
             </command>
         </action>
 

-        <data-files>
-            <srcdir>$(BUILDDIR)</srcdir>
-            <files>lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h</files>
-            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
-        </data-files>
+        <set var="RCDEFS_H">
+            <if cond="TOOLKIT=='MSW'">msw/rcdefs.h</if>
+        </set>
+        <headers>
+            <srcdir>
+                $(BUILDDIR)/lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+            </srcdir>
+            <files>
+                setup.h $(RCDEFS_H)
+            </files>
+            <install-to>
+                $(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+            </install-to>
+        </headers>

 
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
 
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>


@@ -141,7 +150,7 @@
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>
             <dependency-of>all</dependency-of>
             <set var="__targetname">$(MACOS_R)</set>
             <command>

-                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)
+                $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o $(MACOS_RSRC)

                 $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
                 $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
             </command>
             <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>


@@ -159,7 +168,7 @@
 
 
     <!-- copy setup.h on DOS/OS2/Windows: -->
 
 
     <!-- copy setup.h on DOS/OS2/Windows: -->

-    <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL']">
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL','MOTIF']">

         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>


@@ -193,6 +202,33 @@
     </if>
 
 
     </if>
 
 

+    <!-- create rcdefs.h on Windows: -->
+    <if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
+
+        <mkdir id="libdir_setup_wx_msw">
+            <depends>libdir_setup_wx</depends>
+            <dir>$(SETUPHDIR)/wx/msw</dir>
+        </mkdir>
+
+        <action id="rcdefs.h">
+
+            <!-- Can't seem to set id to a name with a dollar sign
+                 so use __targetname as a temporary work around -->
+            <set var="__targetname">$(SETUPHDIR)\wx\msw\rcdefs.h</set>
+
+            <dependency-of>setup_h</dependency-of>
+            <depends>libdir_setup_wx_msw</depends>
+            <depends-on-file>$(SRCDIR)/include/wx/msw/genrcdefs.h</depends-on-file>
+
+            <command>
+                $(DOLLAR)(CPP) "$(SRCDIR)\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
+            </command>
+
+        </action>
+
+    </if>
+
+

     <if cond="FORMAT=='autoconf'">
 
         <!-- Show this banner after installation: -->
     <if cond="FORMAT=='autoconf'">
 
         <!-- Show this banner after installation: -->


@@ -218,7 +254,7 @@
 
         <!-- add "make dist" target to autoconf: -->
         <set var="VARS_DONT_ELIMINATE" append="1">
 
         <!-- add "make dist" target to autoconf: -->
         <set var="VARS_DONT_ELIMINATE" append="1">

-            ALL_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION
+            ALL_PORTS_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION

         </set>
         <fragment format="autoconf" file="make_dist.mk"/>
 
         </set>
         <fragment format="autoconf" file="make_dist.mk"/>