there can only be one makefile in a directory

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/render/renddll.bkl b/samples/render/renddll.bkl
deleted file mode 100644 (file)
index 3e9e0e9..0000000
--- a/samples/render/renddll.bkl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-
-    <include file="../../build/bakefiles/common_samples.bkl"/>
-
-    <module id="renddll" cond="SHARED=='1'"
-            template="wx" template_append="wx_append">
-        <dllname>renddll_$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)</dllname>
-        <define>WXUSINGDLL</define>
-        <sources>renddll.cpp</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-    </module>
-
-</makefile>

diff --git a/samples/render/render.bkl b/samples/render/render.bkl
index df144c0f2cf17cad7bee844489072cba8c67bc6f..23ef3a84dc71e81b63c7f85e1b0dc825ec1afa93 100644 (file)
--- a/samples/render/render.bkl
+++ b/samples/render/render.bkl
@@ -13,4 +13,13 @@
         <mac-res>../sample.r</mac-res>
     </exe>
 
+    <module id="renddll" cond="SHARED=='1'"
+            template="wx" template_append="wx_append">
+        <dllname>renddll_$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)</dllname>
+        <define>WXUSINGDLL</define>
+        <sources>renddll.cpp</sources>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+    </module>
+    
 </makefile>