[Wxlua-commit] wxLua/build/bakefiles wxhacks.bkl,1.2,1.3 wxlua.bkl,1.8,1.9 wxluabase.bkl,1.7,1.8

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

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

Modified Files:
	wxhacks.bkl wxlua.bkl wxluabase.bkl 
Log Message:
fixed things related to library names

Index: wxluabase.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxluabase.bkl	27 Jan 2006 21:57:07 -0000	1.7
--- wxluabase.bkl	28 Jan 2006 21:01:07 -0000	1.8
***************
*** 107,114 ****
      <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/>
  
!     <!-- our <lua-lib> tag is simple: it just declares the dependency from the
!          $(value) library; this is because wxLua does not adopt special
!          library namings like wx does -->
!     <define-tag name="wxlua-lib" rules="exe,dll,module"><sys-lib>$(value)</sys-lib></define-tag>
  
      <!-- this tag includes the wxLua required libraries, it will be defined
--- 107,127 ----
      <define-tag name="__wxlua-req-libs-point" rules="exe,dll,module"/>
  
!     <!-- our <wxlua-lib> tag accepts the following values:
! 
!                  'wxluasocket', 'wxluadebug', 'wxlua', 'wxbind', 'lua'
! 
!          as these are the modules built by this project.
!     -->
!     <define-tag name="wxlua-lib" rules="exe,dll,module">
!         <if cond="value not in [ 'wxluasocket', 'wxluadebug', 'wxlua', 'wxbind', 'lua' ]">
!             <error>Invalid wxlua-lib value !</error>
!         </if>
!         <if cond="TARGETING_WIN32=='1'">
!             <sys-lib>wxlua_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
!         </if>
!         <if cond="TARGETING_WIN32=='0'">
!             <sys-lib>wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</sys-lib>
!         </if>
!     </define-tag>
  
      <!-- this tag includes the wxLua required libraries, it will be defined

Index: wxhacks.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxhacks.bkl	27 Jan 2006 21:57:06 -0000	1.2
--- wxhacks.bkl	28 Jan 2006 21:01:07 -0000	1.3
***************
*** 114,124 ****
  
      <!-- A simple tag which helps you to define a library name using the same rules used
!          by wxWidgets. -->
      <define-tag name="wxlike-libname" rules="lib,dll,module">
          <if cond="TARGETING_WIN32=='1'">
!             <libname>wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</libname>
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <libname>wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</libname>
          </if>
      </define-tag>
--- 114,128 ----
  
      <!-- A simple tag which helps you to define a library name using the same rules used
!          by wxWidgets. Use the 'prefix' attribute to add your lib's prefix.
!          E.g.:
!              <wxlike-libname prefix='mylib'>module1</wxlike-libname>
!              <wxlike-libname prefix='mylib'>module2</wxlike-libname>
!     -->
      <define-tag name="wxlike-libname" rules="lib,dll,module">
          <if cond="TARGETING_WIN32=='1'">
!             <libname>wx$(getTagAttrib('prefix', ''))_$(WX_PORT)$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</libname>
          </if>
          <if cond="TARGETING_WIN32=='0'">
!             <libname>wx$(getTagAttrib('prefix', ''))_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</libname>
          </if>
      </define-tag>

Index: wxlua.bkl
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxlua.bkl	27 Jan 2006 21:57:07 -0000	1.8
--- wxlua.bkl	28 Jan 2006 21:01:07 -0000	1.9
***************
*** 121,124 ****
--- 121,126 ----
  
      <pkgconfig id="pkgconfig" cond="FORMAT=='autoconf'">
+         <!-- the DOT is required !! -->
+         <srcdir>.$(top_builddir)</srcdir>
          <files>build/autoconf/wxlua.pc</files>
      </pkgconfig>