X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d2643327c822976f88529ffb02d7fdd0a1f3bf7..dbe931ab5e8129e8de3d12ccdb2a207ed235cad6:/build/bakefiles/wx.bkl

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 2a772ccfdc..53f72b47f6 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -6,6 +6,11 @@
 
 <makefile>
 
+    <!-- make sure setup.h is created as soon as possible: -->
+    <phony id="setup_h" cond="FORMAT!='autoconf'">
+        <dependency-of>all</dependency-of>
+    </phony>
+
     <set var="BUILDING_LIB">1</set>
 
     <!-- common rules, names etc. for wx: -->
@@ -23,11 +28,11 @@
     
     
     <!-- Samples target (not dependency of 'all'): -->
-    <!-- [ FIXME disabled; currently causes make install to go into samples ]
     <subproject id="samples">
-        <dir>samples</dir>
+        <installable>no</installable>
+        <dir cond="FORMAT=='autoconf'">samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
     </subproject>
-    -->
 
     <if cond="FORMAT=='autoconf'">       
         <!-- "make install": -->
@@ -66,6 +71,17 @@
             <files>$(ALL_HEADERS)</files>
         </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>
@@ -87,6 +103,23 @@
                 $(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>
 
@@ -96,24 +129,63 @@
         <mkdir id="libdir">
             <dir>$(LIBDIRNAME)</dir>
         </mkdir>
-        <mkdir id="libdir_wx">
+        <mkdir id="libdir_setup">
             <depends>libdir</depends>
-            <dir>$(LIBDIRNAME)/wx</dir>
+            <dir>$(SETUPHDIR)</dir>            
+        </mkdir>
+        <mkdir id="libdir_setup_wx">
+            <depends>libdir_setup</depends>
+            <dependency-of>setup_h</dependency-of>
+            <dir>$(SETUPHDIR)/wx</dir>            
         </mkdir>
+
+        <set var="SETUP_H_SUBDIR">
+            <if cond="WXUNIV=='1'">univ</if>
+            <if cond="WXUNIV=='0'">msw</if>
+        </set>
         
-        <copy-file-to-file id="msw/setup.h">
-            <src>$(SRCDIR)/include/wx/msw/setup0.h</src>
-            <dst>$(SRCDIR)/include/wx/msw/setup.h</dst>
-        </copy-file-to-file>
-        <copy-file-to-file id="setup.h">
-            <depends>msw/setup.h</depends>
-            <depends>libdir_wx</depends>
-            <src>$(SRCDIR)/include/wx/msw/setup.h</src>
-            <dst>$(LIBDIRNAME)/wx/setup.h</dst>            
-        </copy-file-to-file>
-        <phony id="setup_h">
-            <depends>setup.h</depends>
-        </phony>
+        <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>
+            <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</src>
+            <dst>$(SETUPHDIR)/wx/setup.h</dst>
+        </copy-file-to-file-if-not-exist>
+    </if>
+
+
+    <if cond="FORMAT=='autoconf'">
+
+        <!-- Show this banner after installation: -->
+        <modify-target target="install">
+            <command>
+@echo " "
+@echo " ------------------------------------------------------"
+@echo " "
+@echo " The installation of wxWindows 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 " wxWindows comes with no guarantees and doesn't claim"
+@echo " to be suitable for any purpose."
+@echo " "
+@echo " Read the wxWindows 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>
 
 </makefile>