wxlua-commit

[John L. <jr...@us...>]

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

Modified Files:
	common.bkl modules.bkl 
Log Message:
Updated bakefiles and autoconf to find the wxWidgets libs that exist on the system and link to those
Also create only the wxLua bind libs for the existing wxWidgets libs
Done by using $(WXLUA_LIBS) for autoconf like $(WX_LIBS) for the wxlua-lib tag
   and adding wxluamodule-lib to allow explicitly specifying the wxLua libs to 
   link to for the modules.


Index: common.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/common.bkl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** common.bkl	2 Aug 2007 18:25:42 -0000	1.16
--- common.bkl	10 Jan 2008 17:04:25 -0000	1.17
***************
*** 110,114 ****
      <!-- ================================================================== -->
  
!     <define-rule name="wxlua_lib" extends="lib">
          <template>
              <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
--- 110,133 ----
      <!-- ================================================================== -->
  
!     <!-- NOTE: This tag should be the same as the same as the non-autoconf wxlua-lib tag -->
!     <define-tag name="wxluamodule-lib" rules="exe,dll,module">
!         <if cond="value not in WXLUA_LIB_LIST.split()">
!             <error>Unknown wxLua library given in the wxluamodule-lib tag</error>
!         </if>
! 
!         <if cond="value=='lua'">
!             <sys-lib>lua5.1</sys-lib>
!         </if>
!         <if cond="value!='lua'">
!             <wxlike-lib prefix="wxlua">$(value)</wxlike-lib>
!         </if>
!     </define-tag>
!     <template id="wxluamodule-lib" template="wx-lib,wxlua-base">
!         <!-- we don't need to add anything else to wxlua-base template -->
!     </template>
! 
!     <tag-info name="wxluamodule-lib" position="before:wxlua-req-libs"/>
! 
!     <define-rule name="wxluamodule_lib" extends="lib">
          <template>
              <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
***************
*** 153,162 ****
          </define-tag>
          <define-tag name="module-dep">
!             <wxlua-lib>$(value)</wxlua-lib>
              <depends>$(value)_lib</depends>
          </define-tag>
      </define-rule>
  
!     <define-rule name="wxlua_dll" extends="dll">
          <template>
              <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
--- 172,181 ----
          </define-tag>
          <define-tag name="module-dep">
!             <wxluamodule-lib>$(value)</wxluamodule-lib>
              <depends>$(value)_lib</depends>
          </define-tag>
      </define-rule>
  
!     <define-rule name="wxluamodule_dll" extends="dll">
          <template>
              <wxlua-dirname>$(WXLUA_LIBDIR)</wxlua-dirname>
***************
*** 216,220 ****
          </define-tag>
          <define-tag name="module-dep">
!             <wxlua-lib>$(value)</wxlua-lib>
              <depends>$(value)_dll</depends>
          </define-tag>
--- 235,239 ----
          </define-tag>
          <define-tag name="module-dep">
!             <wxluamodule-lib>$(value)</wxluamodule-lib>
              <depends>$(value)_dll</depends>
          </define-tag>

Index: modules.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** modules.bkl	1 Aug 2007 10:08:23 -0000	1.48
--- modules.bkl	10 Jan 2008 17:04:25 -0000	1.49
***************
*** 17,28 ****
      <include file="common.bkl" once="1"/>
  
      <!-- Here it's important to use template_append and not just template ! -->
!     <define-rule name="wxlua_stdlib" extends="wxlua_lib">
!         <template template_append="wxlua-lib">
              <!-- always use wxLua's official wxluasetup.h for standard wxLua modules -->
              <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include>
          </template>
      </define-rule>
!     <define-rule name="wxlua_stddll" extends="wxlua_dll">
          <template template_append="wxlua">
              <!-- always use wxLua's official wxluasetup.h for standard wxLua modules -->
--- 17,29 ----
      <include file="common.bkl" once="1"/>
  
+ 
      <!-- Here it's important to use template_append and not just template ! -->
!     <define-rule name="wxlua_stdlib" extends="wxluamodule_lib">
!         <template template_append="wxluamodule-lib">
              <!-- always use wxLua's official wxluasetup.h for standard wxLua modules -->
              <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include>
          </template>
      </define-rule>
!     <define-rule name="wxlua_stddll" extends="wxluamodule_dll">
          <template template_append="wxlua">
              <!-- always use wxLua's official wxluasetup.h for standard wxLua modules -->