[Wxlua-commit] wxLua/modules Makefile.in,1.51,1.52

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

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

Modified Files:
	Makefile.in 
Log Message:
now BUILDDIR is set exactly like the wxWidgets builddir
system LUA is now used if available on Unix or on Windows with USE_SYSTEM_LUA=1
changed the way the lua headers are included (removed the 'lua/include' prefix) to make it possible to use 
external lua
Now when using built-in LUA the generated library is named lua5.1 and it overwrites any eventually preexisting 
lua library (when installed).
Fixed the "samples" directory copy when srcdir==.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** Makefile.in	17 Dec 2006 10:33:35 -0000	1.51
--- Makefile.in	19 Dec 2006 21:12:00 -0000	1.52
***************
*** 45,49 ****
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
- WX_CFLAGS = @WX_CFLAGS@
  WX_CXXFLAGS = @WX_CXXFLAGS@
  WX_LIBS = @WX_LIBS@
--- 45,48 ----
***************
*** 52,55 ****
--- 51,55 ----
  WX_VERSION_MINOR = @WX_VERSION_MINOR@
[...1421 lines suppressed...]
  
! lua_dll_lstrlib.o: $(srcdir)/lua/src/lstrlib.c
! 	$(CCC) -c -o $@ $(LUA_DLL_CFLAGS) $(srcdir)/lua/src/lstrlib.c
  
! lua_dll_loadlib.o: $(srcdir)/lua/src/loadlib.c
! 	$(CCC) -c -o $@ $(LUA_DLL_CFLAGS) $(srcdir)/lua/src/loadlib.c
  
! lua_dll_linit.o: $(srcdir)/lua/src/linit.c
! 	$(CCC) -c -o $@ $(LUA_DLL_CFLAGS) $(srcdir)/lua/src/linit.c
  
  wxlua_lib_wxlcallb.o: $(srcdir)/wxlua/src/wxlcallb.cpp $(WXLUA_LIB_ODEP)
***************
*** 1738,1740 ****
  @IF_GNU_MAKE@-include .deps/*.d
  
! .PHONY: all install uninstall clean distclean install_verbatimlua_lib uninstall_verbatimlua_lib install_verbatimlua_lib_headers uninstall_verbatimlua_lib_headers install_verbatimlua_dll uninstall_verbatimlua_dll install_verbatimlua_dll_headers uninstall_verbatimlua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup
--- 1670,1672 ----
  @IF_GNU_MAKE@-include .deps/*.d
  
! .PHONY: all install uninstall clean distclean install_lua_lib uninstall_lua_lib install_lua_lib_headers uninstall_lua_lib_headers install_lua_dll uninstall_lua_dll install_lua_dll_headers uninstall_lua_dll_headers install_wxlua_lib uninstall_wxlua_lib install_wxlua_lib_headers uninstall_wxlua_lib_headers install_wxlua_dll uninstall_wxlua_dll install_wxlua_dll_headers uninstall_wxlua_dll_headers install_wxbind_lib uninstall_wxbind_lib install_wxbind_lib_headers uninstall_wxbind_lib_headers install_wxbind_dll uninstall_wxbind_dll install_wxbind_dll_headers uninstall_wxbind_dll_headers install_wxbindstc_lib uninstall_wxbindstc_lib install_wxbindstc_lib_headers uninstall_wxbindstc_lib_headers install_wxbindstc_dll uninstall_wxbindstc_dll install_wxbindstc_dll_headers uninstall_wxbindstc_dll_headers install_wxluadebug_lib uninstall_wxluadebug_lib install_wxluadebug_lib_headers uninstall_wxluadebug_lib_headers install_wxluadebug_dll uninstall_wxluadebug_dll install_wxluadebug_dll_headers uninstall_wxluadebug_dll_headers install_wxluasocket_lib uninstall_wxluasocket_lib install_wxluasocket_lib_headers uninstall_wxluasocket_lib_headers install_wxluasocket_dll uninstall_wxluasocket_dll install_wxluasocket_dll_headers uninstall_wxluasocket_dll_headers install_mod_luamodule uninstall_mod_luamodule wxbindsrc wxbindmake wxbindsetup