remove extra space at top and bottom of the page if present

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

diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index aa11cccbe38bff0e02371e860556514f25c7573e..19b7fbf693415761fb6194c0159784f8afc111d7 100644 (file)
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -1,8 +1,10 @@
 <?xml version="1.0" ?>
 <?xml version="1.0" ?>

+<!-- $Id$ -->
+

 <makefile>
     
     <include file="common.bkl"/>
 <makefile>
     
     <include file="common.bkl"/>

-
+    <set var="file_common_samples_included">1</set>

     
     <!-- =============================================================== -->
     <!--                    Template for wxWindows samples:              -->
     
     <!-- =============================================================== -->
     <!--                    Template for wxWindows samples:              -->


@@ -20,16 +22,22 @@
         <if cond="SHARED=='1'">WXUSINGDLL</if>
     </set>
     
         <if cond="SHARED=='1'">WXUSINGDLL</if>
     </set>
     

-    <template id="wx_sample" template="wx">
+    <template id="wx_sample_b" 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>
         <define>$(DLLFLAG)</define>
         <include>$(SRCDIR)</include>
         <!-- Always link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
         <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
         <define>$(DLLFLAG)</define>

+    </template>
+    
+    <template id="wx_sample" template="wx_sample_b">

         <app-type>gui</app-type>
         <app-type>gui</app-type>

-

         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
     </template>
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
     </template>

+    
+    <template id="wx_sample_console" template="wx_sample_b">
+        <app-type>console</app-type>
+    </template>

 
     
     <!-- =============================================================== -->
 
     
     <!-- =============================================================== -->


@@ -42,11 +50,20 @@
             <dstdir>$(BUILDDIR)</dstdir>
             <srcdir>$(SRCDIR)</srcdir>
         </template>
             <dstdir>$(BUILDDIR)</dstdir>
             <srcdir>$(SRCDIR)</srcdir>
         </template>

+
+        <!--
+        VS - FIXME:
+        Don't clean the files because it would wipe out sources files if
+        BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
+        but it would be better to delete the files during "make clean" if
+        BUILDDIR!=SRCDIR.
+        

         <define-tag name="files">
             <clean-files>
                 $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
             </clean-files>
         </define-tag>
         <define-tag name="files">
             <clean-files>
                 $(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
             </clean-files>
         </define-tag>

+        -->

     </define-rule>
 
 </makefile>
     </define-rule>
 
 </makefile>