[Wxlua-commit] wxLua/apps/build/bakefiles apps.bkl,1.16,1.17

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/apps/build/bakefiles

Modified Files:
	apps.bkl 
Log Message:
fixed top_builddir problems

Index: apps.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** apps.bkl	25 Jan 2006 18:35:58 -0000	1.16
--- apps.bkl	27 Jan 2006 21:57:05 -0000	1.17
***************
*** 21,26 ****
--- 21,30 ----
          <set var="WXLUA_BASEDIR">../../..</set>
          <set var="WXLUA_APPSDIR">../..</set>
+         <set var="SRCDIR">$(WXLUA_APPSDIR)</set>
+         <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set>
      </if>
      <if cond="TARGETING_WIN32=='0'">
+         <set var="SRCDIR">.</set>
+ 
          <!-- In this way we support makefiles created from folders != root folder;
               i.e. with this trick you can do:
***************
*** 29,32 ****
--- 33,37 ----
          <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
          <set var="WXLUA_APPSDIR">$(top_srcdir)/apps</set>
+         <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set>
      </if>
  
***************
*** 36,41 ****
      <!-- ================================================================== -->
  
-     <set var="SRCDIR">$(WXLUA_APPSDIR.replace('$(top_srcdir)', '..'))</set>
- 
      <set var="WXLUAAPP_SRC">$(fileList('wxlua/src/*.cpp'))</set>
      <set var="WXLUAAPP_HDR">$(fileList('wxlua/src/*.h'))</set>
--- 41,44 ----
***************
*** 62,71 ****
                 as a module target... this would lead to problems when creating global DSW file... -->
      <exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'">
-         <srcdir>$(WXLUA_APPSDIR)</srcdir>
          <app-type>gui</app-type>
          <sources>$(WXLUAAPP_SRC)</sources>
          <headers>$(WXLUAAPP_HDR)</headers>
  
!         <dirname>$(WXLUA_BASEDIR)/bin</dirname>
          <install-to>$(BINDIR)</install-to>
  
--- 65,74 ----
                 as a module target... this would lead to problems when creating global DSW file... -->
      <exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'">
          <app-type>gui</app-type>
+         <srcdir>$(WXLUA_APPSDIR)</srcdir>
          <sources>$(WXLUAAPP_SRC)</sources>
          <headers>$(WXLUAAPP_HDR)</headers>
  
!         <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
          <install-to>$(BINDIR)</install-to>
  
***************
*** 95,105 ****
  
      <exe id="app_wxluaedit" template="wxlua" cond="USE_WXLUAEDITAPP=='1'">
-         <srcdir>$(WXLUA_APPSDIR)</srcdir>
          <app-type>gui</app-type>
          <sources>$(WXLUAEDITAPP_SRC)</sources>
          <headers>$(WXLUAEDITAPP_HDR)</headers>
  
          <install-to>$(BINDIR)</install-to>
!         <dirname>$(WXLUA_BASEDIR)/bin</dirname>
  
          <exename>wxluaedit</exename>
--- 98,108 ----
  
      <exe id="app_wxluaedit" template="wxlua" cond="USE_WXLUAEDITAPP=='1'">
          <app-type>gui</app-type>
+         <srcdir>$(WXLUA_APPSDIR)</srcdir>
          <sources>$(WXLUAEDITAPP_SRC)</sources>
          <headers>$(WXLUAEDITAPP_HDR)</headers>
  
          <install-to>$(BINDIR)</install-to>
!         <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname>
  
          <exename>wxluaedit</exename>