X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fab9850d5d29606bed08400f127c16bdc8a713d6..c90cc42e987809e59873d1fdb4630be71aa0a32a:/build/bakefiles/common_contrib.bkl?ds=inline

diff --git a/build/bakefiles/common_contrib.bkl b/build/bakefiles/common_contrib.bkl
index 9ef1166505..49c23c63aa 100644
--- a/build/bakefiles/common_contrib.bkl
+++ b/build/bakefiles/common_contrib.bkl
@@ -1,9 +1,13 @@
 <?xml version="1.0" ?>
+<!-- $Id$ -->
+
 <makefile>
     
-    <include file="common.bkl"/>
+    <if cond="not isdefined('file_common_samples_included')">
+        <include file="common.bkl"/>
+    </if>
     
-    <set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../include</set>
+    <set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
     
     <!-- =============================================================== -->
     <!--                      Contrib lib helpers:                       -->
@@ -13,15 +17,22 @@
         <include>$(CONTRIB_HDR_DIR)</include>
     </template>
     
+    <if cond="isdefined('file_common_samples_included')">
+        <template id="wx_contrib_sample" template="wx_sample">
+            <include>$(CONTRIB_HDR_DIR)</include>
+        </template>
+        <template id="wx_contrib_util" template="wx_util">
+            <include>$(CONTRIB_HDR_DIR)</include>
+        </template>
+    </if>
+    
     <template id="wx_contrib_dll"
               template="wx_dll_b" template_append="wx_append">
         <include>$(CONTRIB_HDR_DIR)</include>
-        <!-- Always link against the wxWin library in monolithic build: -->
-        <sys-lib>$(WXLIB_MONO)</sys-lib>
     </template>
-
+    
     <template id="wx_contrib_headers">
         <srcdir>$(CONTRIB_HDR_DIR)</srcdir>
+        <install-to>$(INCLUDEDIR)/wx-$(WXVER_MAJOR).$(WXVER_MINOR)</install-to>
     </template>
-    
 </makefile>