[Wxlua-commit] wxLua Makefile.in,1.18,1.19 configure,1.39,1.40

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

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

Modified Files:
	Makefile.in configure 
Log Message:
Switched to latest patched bakefile (which only differs for option renaming feature).
Removed customized build of LUA interpreter: we now use vanilla lua.
Now BUILDDIR is set differently for shared and static builds to avoid clashes.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.in	15 Sep 2006 16:24:35 -0000	1.18
--- Makefile.in	8 Dec 2006 13:19:56 -0000	1.19
***************
*** 31,39 ****
  ### Targets: ###
  
! all: $(top_builddir)lib $(top_builddir)bin modules $(__apps___depname)
  
  install: all install_modules $(__install_apps___depname) samples desktop mime icon
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig
! 	$(INSTALL_DATA) $(top_builddir)build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig
  
  uninstall: uninstall_modules $(__uninstall_apps___depname)
--- 31,39 ----
  ### Targets: ###
  
! all: $(top_builddir)/lib $(top_builddir)/bin modules $(__apps___depname)
  
  install: all install_modules $(__install_apps___depname) samples desktop mime icon
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig
! 	$(INSTALL_DATA) $(top_builddir)/build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig
  
  uninstall: uninstall_modules $(__uninstall_apps___depname)
***************
*** 50,62 ****
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
! 	rm -f ./modules/Makefile
! 	rm -f ./apps/Makefile
! 	rm -f $(top_builddir)build/autoconf/wxlua.pc
  
! $(top_builddir)lib: 
! 	@mkdir -p $(top_builddir)lib
  
! $(top_builddir)bin: 
! 	@mkdir -p $(top_builddir)bin
  
  modules: 
--- 50,62 ----
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
! 	(cd ./modules/ && $(MAKE) distclean)
! 	(cd ./apps/ && $(MAKE) distclean)
! 	rm -f $(top_builddir)/build/autoconf/wxlua.pc
  
! $(top_builddir)/lib: 
! 	@mkdir -p $(top_builddir)/lib
  
! $(top_builddir)/bin: 
! 	@mkdir -p $(top_builddir)/bin
  
  modules: 
***************
*** 86,90 ****
  samples: 
  	@mkdir -p $(DESTDIR)$(datadir)/wxlua/samples
! 	@for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \
  	if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \
  	then x=yep ; \
--- 86,90 ----
  samples: 
  	@mkdir -p $(DESTDIR)$(datadir)/wxlua/samples
! 	@for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \
  	if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \
  	then x=yep ; \

Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** configure	9 Aug 2006 03:34:48 -0000	1.39
--- configure	8 Dec 2006 13:19:56 -0000	1.40
***************
*** 1,9 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for wxLua 0.
  #
  # Report bugs to <fr...@us...>.
  #
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,10 ----
[...12603 lines suppressed...]
!   { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
! which seems to be undefined.  Please make sure it is defined." >&5
! echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
! which seems to be undefined.  Please make sure it is defined." >&2;}
! 
!   rm -f "$tmp/stdin"
!   case $ac_file in
!   -) cat "$tmp/out"; rm -f "$tmp/out";;
!   *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
!   esac
!  ;;
! 
! 
! 
!   esac
! 
! done # for ac_tag
  
  
  { (exit 0); exit 0; }