No res-include for rpmspec wx24dsp

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index eab78dd71284619a721aed4f8c107e92fcdbbbee..197f1b4d7abfd8c01b5db92d1cfdff13ea826868 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -40,10 +40,33 @@
     <subproject id="samples">
         <installable>no</installable>
         <dir cond="FORMAT=='autoconf'">samples</dir>
-        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir>
     </subproject>
-
-    <if cond="FORMAT=='autoconf'">       
+    
+    <if cond="FORMAT=='autoconf'">
+    
+        <!-- WXRC compiler is built by default: -->
+        <!-- FIXME: this is dirty hack, better bakefile support for
+             conditional and optional subprojects is needed -->
+        <action id="wxrc" cond="USE_XRC=='1'">
+            <dependency-of>all</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
+            </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
+            </command>
+        </action>
+        <action id="install-wxrc" cond="USE_XRC=='1'">
+            <dependency-of>install</dependency-of>
+            <command>
+                (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
+            </command>
+        </action>
+    
         <!-- "make install": -->
 
         <data-files>
@@ -51,36 +74,28 @@
             <install-to>$(DATADIR)/aclocal</install-to>
         </data-files>
 
-        <data-files-tg id="install-afm" cond="USE_GUI=='1'">
-            <files>misc/afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/afm</install-to>
-        </data-files-tg>
-        <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
-            <files>misc/gs_afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/$(WXVER_MAJOR).$(WXVER_MINOR)/gs_afm</install-to>
-        </data-files-tg>
-
         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>
                 $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
                 $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
-                $(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
-                (cd $(DESTDIR)$(LIBDIR)/wx/config &amp;&amp; rm -f $(TOOLCHAIN_NAME) &amp;&amp; $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
-                $(INSTALL_PROGRAM) wx-config $(DESTDIR)$(BINDIR)
-                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx$(TOOLCHAIN_NAME)-config &amp;&amp; $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)
+                $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
             </command>
         </action>
 
         <data-files>
             <srcdir>$(BUILDDIR)</srcdir>
-            <files>lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h</files>
-            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_NAME)/wx</install-to>
+            <files>lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h</files>
+            <install-to>$(LIBDIR)/wx/include/$(TOOLCHAIN_FULLNAME)/wx</install-to>
         </data-files>
 
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
             <files>$(ALL_HEADERS)</files>
+            <install-to>
+                $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+            </install-to>
         </headers>
 
         <!-- Locales: -->
@@ -136,8 +151,8 @@
     </if>
 
 
-    <!-- copy setup.h on Windows: -->    
-    <if cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">
+    <!-- copy setup.h on DOS/Windows: -->    
+    <if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
@@ -153,7 +168,7 @@
 
         <set var="SETUP_H_SUBDIR">
             <if cond="WXUNIV=='1'">univ</if>
-            <if cond="WXUNIV=='0'">msw</if>
+            <if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
         </set>
         
         <copy-file-to-file-if-not-exist id="master_setup.h">