Update to Bakefile 0.1.6

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

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 14edf7dfbcc64f938e83c1c52f0a58b51bf212e6..197f1b4d7abfd8c01b5db92d1cfdff13ea826868 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
 <!-- $Id$ -->
 
 

-<!-- Master bakefile for wxWindows -->
+<!-- Master bakefile for wxWidgets -->

 
 <makefile>
 
 
 <makefile>
 


@@ -12,29 +12,61 @@
     </phony>
 
     <set var="BUILDING_LIB">1</set>
     </phony>
 
     <set var="BUILDING_LIB">1</set>

-
+    

     <!-- common rules, names etc. for wx: -->
     <include file="common.bkl"/>
     <!-- common rules, names etc. for wx: -->
     <include file="common.bkl"/>

-
+    

     <!-- list of files sorted into categories: -->
     <include file="files.bkl"/>
     <!-- list of files sorted into categories: -->
     <include file="files.bkl"/>

-
-    <!-- wxWindows variant where everything is in one library: -->
+    
+    <!-- wxWidgets variant where everything is in one library: -->

     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
     <include file="monolithic.bkl"/>
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>

+
+    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
+        <set var="MSVC6PRJ_MERGED_TARGETS">
+            <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
+            <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
+        </set>
+    </if>
+    

     <!-- OpenGL canvas is built as separate library in both cases: -->
     <include file="opengl.bkl"/>
     <!-- OpenGL canvas is built as separate library in both cases: -->
     <include file="opengl.bkl"/>

-    
-    
+    <!-- Dynamically loadable plugins: -->
+    <include file="plugins.bkl"/>
+ 

     <!-- Samples target (not dependency of 'all'): -->
     <!-- Samples target (not dependency of 'all'): -->

-    <!-- [ FIXME disabled; currently causes make install to go into samples ]

     <subproject id="samples">
     <subproject id="samples">

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

     </subproject>
     </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>
         <!-- "make install": -->
 
         <data-files>


@@ -42,35 +74,41 @@
             <install-to>$(DATADIR)/aclocal</install-to>
         </data-files>
 
             <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>
         <action id="install-wxconfig">
             <dependency-of>install</dependency-of>
             <command>

-                $(INSTALL_DIR) $(BINDIR)
-                $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(BINDIR)
-                (cd $(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
+                $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+                $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/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>
             </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>
         </data-files>
 
         <headers>
             <srcdir>$(SRCDIR)/include</srcdir>
             <files>$(ALL_HEADERS)</files>

+            <install-to>
+                $(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
+            </install-to>

         </headers>
 
         </headers>
 

+        <!-- Locales: -->
+        <using module="gettext"/>
+        <gettext-catalogs id="locale">
+            <srcdir>$(SRCDIR)/locale</srcdir>
+            <catalog-name>wxstd</catalog-name>
+            <linguas>
+                ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+                zh zh_CN zh_TW
+            </linguas>
+            <install-to>$(LOCALEDIR)</install-to>
+        </gettext-catalogs>

 
         <!-- Mac OS X resources: -->
         <set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>
 
         <!-- Mac OS X resources: -->
         <set var="MACOS_R">lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r</set>


@@ -79,7 +117,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/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o $(MACOS_RSRC)
+                $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/carbon/apprsrc.r $(top_srcdir)/src/mac/carbon/carbrsrc.r $(top_srcdir)/src/mac/carbon/corersrc.r -o $(MACOS_RSRC)

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


@@ -92,31 +130,92 @@
                 $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
             </command>
         </action>
                 $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
             </command>
         </action>

+        <action id="cocoa-res" cond="TOOLKIT=='COCOA'">
+            <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)
+                $(DEREZ) $(MACOS_RSRC) -useDF >$(MACOS_R)
+            </command>
+            <clean-files>$(MACOS_RSRC) $(MACOS_R)</clean-files>
+        </action>
+        <action id="cocoa-res-install" cond="TOOLKIT=='COCOA'">
+            <dependency-of>install</dependency-of>
+            <depends>macos-res</depends>
+            <command>
+                $(INSTALL_DATA) $(MACOS_R) $(LIBDIR)
+                $(INSTALL_DATA) $(MACOS_RSRC) $(LIBDIR)
+            </command>
+        </action>

 
     </if>
 
 
 
     </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>
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>

-        <mkdir id="libdir_wx">
+        <mkdir id="libdir_setup">

             <depends>libdir</depends>
             <depends>libdir</depends>

+            <dir>$(SETUPHDIR)</dir>            
+        </mkdir>
+        <mkdir id="libdir_setup_wx">
+            <depends>libdir_setup</depends>

             <dependency-of>setup_h</dependency-of>
             <dependency-of>setup_h</dependency-of>

-            <dir>$(LIBDIRNAME)/wx</dir>            
+            <dir>$(SETUPHDIR)/wx</dir>            

         </mkdir>
         </mkdir>

+
+        <set var="SETUP_H_SUBDIR">
+            <if cond="WXUNIV=='1'">univ</if>
+            <if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if>
+        </set>

         
         

-        <copy-file-to-file-if-not-exist id="msw/setup.h">
-            <src>$(SRCDIR)/include/wx/msw/setup0.h</src>
-            <dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
+        <copy-file-to-file-if-not-exist id="master_setup.h">
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src>
+            <dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst>

             <dependency-of>setup_h</dependency-of>
         </copy-file-to-file-if-not-exist>
         <copy-file-to-file-if-not-exist id="setup.h">
             <dependency-of>setup_h</dependency-of>
             <dependency-of>setup_h</dependency-of>
         </copy-file-to-file-if-not-exist>
         <copy-file-to-file-if-not-exist id="setup.h">
             <dependency-of>setup_h</dependency-of>

-            <src>$(SRCDIR)/include/wx/msw/setup.h</src>
-            <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
+            <dst>$(SETUPHDIR)/wx/setup.h</dst>

         </copy-file-to-file-if-not-exist>
         </copy-file-to-file-if-not-exist>

+

     </if>
 
     </if>
 

+
+    <if cond="FORMAT=='autoconf'">
+
+        <!-- Show this banner after installation: -->
+        <modify-target target="install">
+            <command>
+@echo " "
+@echo " ------------------------------------------------------"
+@echo " "
+@echo " The installation of wxWidgets is finished.  On certain"
+@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+@echo " if you installed a shared library and also modify the"
+@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
+@echo " "
+@echo " wxWidgets comes with no guarantees and doesn't claim"
+@echo " to be suitable for any purpose."
+@echo " "
+@echo " Read the wxWidgets Licence on licencing conditions."
+@echo " "
+@echo " ------------------------------------------------------"
+@echo " "
+            </command>
+        </modify-target>
+
+        <!-- add "make dist" target to autoconf: -->
+        <set var="VARS_DONT_ELIMINATE" append="1">
+            ALL_BASE_SOURCES WX_VERSION
+        </set>
+        <fragment format="autoconf" file="make_dist.mk"/>
+
+    </if>
+        
+    <include file="build_cfg.bkl"/>
+

 </makefile>
 </makefile>