synchronize GTK2 minimum version in docs

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

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index d293b934de299badda9c8270f35ec895873b0b81..c63cb2130974329645f62219e96942e76e14cb1a 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -1,48 +1,17 @@
 <?xml version="1.0" ?>
 <?xml version="1.0" ?>

-<makefile>
-    
-    <set var="BUILDING_LIB">0</set>
-
-    <include file="common.bkl"/>
+<!-- $Id$ -->

 
 

+<makefile>

     
     

-    <!-- =============================================================== -->
-    <!--                    Template for wxWindows samples:              -->
-    <!-- =============================================================== -->
-
-    <if cond="FORMAT=='autoconf'">
-        <set var="MACOSX_RESOURCES">
-            <if cond="TOOLKIT=='MAC'">
-                Carbon.r ../../lib/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).r
-            </if>
-        </set>
+    <if cond="not isdefined('OUT_OF_TREE_MAKEFILES')">
+        <set var="OUT_OF_TREE_MAKEFILES">0</set>

     </if>
     </if>

-    
-    <template id="wx_sample" template="wx">
-        <include>$(SRCDIR)</include>
-        <!-- Always link against the wxWin library in monolithic build: -->
-        <sys-lib>$(WXLIB_MONO)</sys-lib>
-        <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>

 
 

-        <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
-    </template>
-
-    
-    <!-- =============================================================== -->
-    <!--                    Support for samples data files:              -->
-    <!-- =============================================================== -->
-
-    <define-rule name="wx-data" extends="copy-files">
-        <template>
-            <dependency-of>all</dependency-of>
-            <dstdir>$(BUILDDIR)</dstdir>
-            <srcdir>$(SRCDIR)</srcdir>
-        </template>
-        <define-tag name="files">
-            <clean-files>
-                $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
-            </clean-files>
-        </define-tag>
-    </define-rule>
+    <if cond="OUT_OF_TREE_MAKEFILES=='1'">
+        <include file="common_samples_outoftree.bkl"/>
+    </if>
+    <if cond="OUT_OF_TREE_MAKEFILES=='0'">
+        <include file="common_samples_intree.bkl"/>
+    </if>

 
 </makefile>
 
 </makefile>