[Wxlua-commit] wxLua/modules/build/bakefiles common.bkl, 1.10, 1.11 modules.bkl, 1.43, 1.44

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

Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13500/modules/build/bakefiles

Modified Files:
	common.bkl modules.bkl 
Log Message:
fixed output path for libs and apps

Index: common.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** common.bkl	23 Apr 2007 22:44:30 -0000	1.10
--- common.bkl	24 Apr 2007 14:21:09 -0000	1.11
***************
*** 23,27 ****
      <if cond="FORMAT!='autoconf'">
          <set var="WXLUA_BASEDIR">../../..</set>
!         <set var="WXLUA_MODULEDIR">../..</set>
  
          <set-srcdir>../..</set-srcdir>
--- 23,27 ----
      <if cond="FORMAT!='autoconf'">
          <set var="WXLUA_BASEDIR">../../..</set>
!         <set var="WXLUA_LIBDIR">../../../lib</set>
  
          <set-srcdir>../..</set-srcdir>
***************
*** 33,36 ****
--- 33,39 ----
          -->
          <set var="WXLUA_BASEDIR">$(top_srcdir)</set>
+         <set var="WXLUA_LIBDIR">../lib</set>
+ 
+         <!-- leave SRCDIR to its '.' default -->
      </if>
  
***************
*** 75,80 ****
      <define-rule name="wxlua_lib" extends="lib">
          <template>
!             <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
!             <wxlua-dirname>../lib</wxlua-dirname>
  
              <set var="__modname"/>
--- 78,82 ----
      <define-rule name="wxlua_lib" extends="lib">
          <template>
!             <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
  
              <set var="__modname"/>
***************
*** 118,123 ****
      <define-rule name="wxlua_dll" extends="dll">
          <template>
!             <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
!             <wxlua-dirname>../lib</wxlua-dirname>
  
              <!-- The DLL version -->
--- 120,124 ----
      <define-rule name="wxlua_dll" extends="dll">
          <template>
!             <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
  
              <!-- The DLL version -->

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** modules.bkl	23 Apr 2007 22:44:30 -0000	1.43
--- modules.bkl	24 Apr 2007 14:21:10 -0000	1.44
***************
*** 65,70 ****
           cond="SHARED=='0' and USE_SYSTEM_LUA=='0'">
  
!         <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
!         <wxlua-dirname>../lib</wxlua-dirname>
          <libname>lua5.1</libname>
  
--- 65,69 ----
           cond="SHARED=='0' and USE_SYSTEM_LUA=='0'">
  
!         <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
          <libname>lua5.1</libname>
  
***************
*** 85,90 ****
           cond="SHARED=='1' and USE_SYSTEM_LUA=='0'">
  
!         <!-- do not prefix "lib" with $(WXLUA_BASEDIR): we want to allow out-of-tree builds!-->
!         <wxlua-dirname>../lib</wxlua-dirname>
          <libname>lua5.1</libname>
          <dllname>lua5.1</dllname>
--- 84,88 ----
           cond="SHARED=='1' and USE_SYSTEM_LUA=='0'">
  
!         <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
          <libname>lua5.1</libname>
          <dllname>lua5.1</dllname>