[Wxlua-commit] wxLua Makefile.in,1.2,1.3 autoconf_inc.m4,1.4,1.5

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

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

Modified Files:
	Makefile.in autoconf_inc.m4 
Log Message:
Fixed modules compilation

Index: autoconf_inc.m4
===================================================================
RCS file: /cvsroot/wxlua/wxLua/autoconf_inc.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** autoconf_inc.m4	14 Jun 2005 20:22:48 -0000	1.4
--- autoconf_inc.m4	14 Jun 2005 21:44:39 -0000	1.5
***************
*** 19,22 ****
--- 19,40 ----
      fi
      AC_SUBST(COND_DEPS_TRACKING_1)
+ dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[modules.bkl] ###
+     COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
+     if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
+         COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
+     fi
+     AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
+ dnl ### begin block 20_COND_PLATFORM_MACOSX_1[modules.bkl] ###
+     COND_PLATFORM_MACOSX_1="#"
+     if test "x$PLATFORM_MACOSX" = "x1" ; then
+         COND_PLATFORM_MACOSX_1=""
+     fi
+     AC_SUBST(COND_PLATFORM_MACOSX_1)
+ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[modules.bkl] ###
+     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
+     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
+         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
+     fi
+     AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
  dnl ### begin block 20_COND_PLATFORM_MAC_1[apps.bkl,modules.bkl,util.bkl] ###
      COND_PLATFORM_MAC_1="#"
***************
*** 25,29 ****
      fi
      AC_SUBST(COND_PLATFORM_MAC_1)
! dnl ### begin block 20_COND_USE_UTIL_1[util.bkl] ###
      COND_USE_UTIL_1="#"
      if test "x$USE_UTIL" = "x1" ; then
--- 43,95 ----
      fi
      AC_SUBST(COND_PLATFORM_MAC_1)
! dnl ### begin block 20_COND_PLATFORM_OS2_1[modules.bkl] ###
!     COND_PLATFORM_OS2_1="#"
!     if test "x$PLATFORM_OS2" = "x1" ; then
!         COND_PLATFORM_OS2_1=""
!     fi
!     AC_SUBST(COND_PLATFORM_OS2_1)
! dnl ### begin block 20_COND_PLATFORM_WIN32_1[apps.bkl,modules.bkl] ###
!     COND_PLATFORM_WIN32_1="#"
!     if test "x$PLATFORM_WIN32" = "x1" ; then
!         COND_PLATFORM_WIN32_1=""
!     fi
!     AC_SUBST(COND_PLATFORM_WIN32_1)
! dnl ### begin block 20_COND_USE_APPS_1[wxlua.bkl] ###
!     COND_USE_APPS_1="#"
!     if test "x$USE_APPS" = "x1" ; then
!         COND_USE_APPS_1=""
!     fi
!     AC_SUBST(COND_USE_APPS_1)
! dnl ### begin block 20_COND_USE_BIN2C_1[util.bkl] ###
!     COND_USE_BIN2C_1="#"
!     if test "x$USE_BIN2C" = "x1" ; then
!         COND_USE_BIN2C_1=""
!     fi
!     AC_SUBST(COND_USE_BIN2C_1)
! dnl ### begin block 20_COND_USE_SOSYMLINKS_1[modules.bkl] ###
!     COND_USE_SOSYMLINKS_1="#"
!     if test "x$USE_SOSYMLINKS" = "x1" ; then
!         COND_USE_SOSYMLINKS_1=""
!     fi
!     AC_SUBST(COND_USE_SOSYMLINKS_1)
! dnl ### begin block 20_COND_USE_SOVERLINUX_1[modules.bkl] ###
!     COND_USE_SOVERLINUX_1="#"
!     if test "x$USE_SOVERLINUX" = "x1" ; then
!         COND_USE_SOVERLINUX_1=""
!     fi
!     AC_SUBST(COND_USE_SOVERLINUX_1)
! dnl ### begin block 20_COND_USE_SOVERSION_0[modules.bkl] ###
!     COND_USE_SOVERSION_0="#"
!     if test "x$USE_SOVERSION" = "x0" ; then
!         COND_USE_SOVERSION_0=""
!     fi
!     AC_SUBST(COND_USE_SOVERSION_0)
! dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[modules.bkl] ###
!     COND_USE_SOVERSOLARIS_1="#"
!     if test "x$USE_SOVERSOLARIS" = "x1" ; then
!         COND_USE_SOVERSOLARIS_1=""
!     fi
!     AC_SUBST(COND_USE_SOVERSOLARIS_1)
! dnl ### begin block 20_COND_USE_UTIL_1[wxlua.bkl] ###
      COND_USE_UTIL_1="#"
      if test "x$USE_UTIL" = "x1" ; then
***************
*** 37,38 ****
--- 103,110 ----
      fi
      AC_SUBST(COND_WX_SHARED_0)
+ dnl ### begin block 20_COND_WX_SHARED_1[modules.bkl] ###
+     COND_WX_SHARED_1="#"
+     if test "x$WX_SHARED" = "x1" ; then
+         COND_WX_SHARED_1=""
+     fi
+     AC_SUBST(COND_WX_SHARED_1)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.in	12 Jun 2005 21:31:38 -0000	1.2
--- Makefile.in	14 Jun 2005 21:44:39 -0000	1.3
***************
*** 18,25 ****
  ### Conditionally set variables: ###
  
  
  ### Targets: ###
  
! all: utils modules apps
  
  install: all
--- 18,27 ----
  ### Conditionally set variables: ###
  
+ @COND_USE_UTIL_1@__utils___depname = utils
+ @COND_USE_APPS_1@__apps___depname = apps
  
  ### Targets: ###
  
! all: $(__utils___depname) modules $(__apps___depname)
  
  install: all
***************
*** 45,56 ****
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! utils: 
! 	(cd ./util/ && $(MAKE) )
  
  modules: 
  	(cd ./modules/ && $(MAKE) )
  
! apps: 
! 	(cd ./apps/ && $(MAKE) )
  
  
--- 47,58 ----
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! @COND_USE_UTIL_1@utils: 
! @COND_USE_UTIL_1@	(cd ./util/ && $(MAKE) )
  
  modules: 
  	(cd ./modules/ && $(MAKE) )
  
! @COND_USE_APPS_1@apps: 
! @COND_USE_APPS_1@	(cd ./apps/ && $(MAKE) )