[Wxlua-commit] wxLua/apps/wxlua/src Makefile,1.5,1.6 Makefile_import,1.4,NONE

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

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

Modified Files:
	Makefile 
Removed Files:
	Makefile_import 
Log Message:
Makefile cleanup


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	20 Nov 2005 06:36:39 -0000	1.5
--- Makefile	20 Nov 2005 22:28:07 -0000	1.6
***************
*** 7,46 ****
  # Makefile for wxLua standalone sample using gmake
  
! WXLUA = ../../..
  
! LUADIR = $(WXLUA)/modules/lua
! WXDIR = $(shell wx-config --prefix)
! WXLIBDIR = $(WXDIR)/lib
  
! WXBASENAME = $(shell wx-config --basename)
! WXLIBBASE  = $(shell wx-config --basename)
! WXVERSION  = $(shell wx-config --version)
! WXRELEASE  = $(shell wx-config --release)
  
! CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g
! LDLIBS   = $(shell wx-config --libs)
! CXX      = $(shell wx-config --cxx) 
  
! PROGRAM = wxLua
  
! LUA = $(WXLUA)/bin/lua
  
! LUA_LIBS  = $(WXLUA)/lib/liblua.a $(WXLUA)/lib/liblualib.a 
! WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE)
! WXLUADEBUG_LIB = $(WXLIBBASE)_wxluadebug-$(WXRELEASE)
! WXLUASOCKET_LIB = $(WXLIBBASE)_wxluasocket-$(WXRELEASE)
! WXLUABIND_LIB = $(WXLIBBASE)_wxluabind-$(WXRELEASE)
! WXSTC_LIB = $(WXLIBBASE)_stc-$(WXRELEASE)
! WXXRC_LIB = $(WXLIBBASE)_xrc-$(WXRELEASE)
! WXFL_LIB  = $(WXLIBBASE)_fl-$(WXRELEASE)
  
! APPEXTRADEFS=-I$(WXLUA)/modules -I$(WXDIR)/contrib/include -fexceptions -DLUACALL=
  
  # This will build a static wxLua app, staticly linked to .a libs
! #APPEXTRALIBS=-L$(WXLIBDIR) $(WXLIBDIR)/lib$(WXLUA_LIB).a $(WXLIBDIR)/lib$(STC_LIB).a $(WXLIBDIR)/lib$(WXXRC_LIB).a $(WXLIBDIR)/lib$(WXFL_LIB).a $(LUA_LIBS)
  
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB)
  
  OBJECTS=wxlua.o
--- 7,56 ----
  # Makefile for wxLua standalone sample using gmake
  
! # --- wxLua parameters -------------------------------------------------------
! WXLUA_LIBVERSION_CURRENT  = 1
! WXLUA_LIBVERSION_REVISION = 5
! WXLUA_LIBVERSION_AGE      = 0
  
! WXLUA_DIR    = ../../..
! WXLUA_LIBDIR = $(WXPREFIX)/lib
  
! LUA = $(WXLUA_DIR)/bin/lua
! # ----------------------------------------------------------------------------
  
! # --- wxWidgets parameters from wx-config ------------------------------------
! WXCONFIG  := wx-config
! WXPREFIX   = $(shell $(WXCONFIG) --prefix)
! WXBASENAME = $(shell $(WXCONFIG) --basename)
! WXVERSION  = $(shell $(WXCONFIG) --version)
! WXRELEASE  = $(shell $(WXCONFIG) --release)
! WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags)
! WXLDLIBS   = $(shell $(WXCONFIG) --libs)
! WXCXX      = $(shell $(WXCONFIG) --cxx) 
! WXLIB_DIR  = $(WXPREFIX)/lib
! # ----------------------------------------------------------------------------
  
! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall
! LDLIBS   = $(WXLDLIBS)
! CXX      = $(WXCXX)
  
! PROGRAM = wxLua
  
! LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a 
! WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
! WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE)
! WXLUABIND_LIB   = $(WXBASENAME)_wxluabind-$(WXRELEASE)
! WXSTC_LIB       = $(WXBASENAME)_stc-$(WXRELEASE)
! WXXRC_LIB       = $(WXBASENAME)_xrc-$(WXRELEASE)
! WXFL_LIB        = $(WXBASENAME)_fl-$(WXRELEASE)
  
! APPEXTRADEFS=-I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL=
  
  # This will build a static wxLua app, staticly linked to .a libs
! #APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS)
  
  # This will build a shared wxLua app, dynamicly linked to .so libs
  #  -l$(WXFL_LIB)
! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB)
  
  OBJECTS=wxlua.o
***************
*** 56,78 ****
  
  lua:
! 	@(cd $(LUADIR) && make)
  
  bindings: 
! 	@(cd $(WXLUA)/bindings/wxwidgets && make)
  
  editor:
! 	$(LUA) $(WXLUA)/util/bin2c/bin2c.lua -t $(WXLUA)/samples/editor.wx.lua wxLuaEditor > editor.h
  
  wxLuaBindings:
! 	@(cd $(WXLUA)/modules/wxbind/src && make)
  
  wxLuaLib:
! 	@(cd $(WXLUA)/modules/wxlua/src && make)
  
  wxLuaDebugLib:
! 	@(cd $(WXLUA)/modules/wxluadebug/src && make)
  
  wxLuaSocketLib:
! 	@(cd $(WXLUA)/modules/wxluasocket/src && make)
  
  clean:
--- 66,88 ----
  
  lua:
! 	@(cd $(WXLUA_DIR)/modules/lua && make)
  
  bindings: 
! 	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make)
  
  editor:
! 	$(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t $(WXLUA_DIR)/samples/editor.wx.lua wxLuaEditor > editor.h
  
  wxLuaBindings:
! 	@(cd $(WXLUA_DIR)/modules/wxbind/src && make)
  
  wxLuaLib:
! 	@(cd $(WXLUA_DIR)/modules/wxlua/src && make)
  
  wxLuaDebugLib:
! 	@(cd $(WXLUA_DIR)/modules/wxluadebug/src && make)
  
  wxLuaSocketLib:
! 	@(cd $(WXLUA_DIR)/modules/wxluasocket/src && make)
  
  clean:
***************
*** 81,89 ****
  cleanall:
  	rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core
! 	make -f Makefile_import clean
! 	@(cd $(WXLUA)/modules/wxlua/src && make clean)
! 	@(cd $(WXLUA)/modules/wxluadebug/src && make clean)
! 	@(cd $(WXLUA)/modules/wxluasocket/src && make clean)
! 	@(cd $(WXLUA)/modules/wxbind/src && make clean)
  
  -include $(DEPFILES)
--- 91,100 ----
  cleanall:
  	rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core
! 	@(cd $(WXLUA_DIR)/modules/lua && make clean)
! 	@(cd $(WXLUA_DIR)/bindings/wxwidgets && make clean)
! 	@(cd $(WXLUA_DIR)/modules/wxbind/src && make clean)
! 	@(cd $(WXLUA_DIR)/modules/wxlua/src && make clean)
! 	@(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean)
! 	@(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean)
  
  -include $(DEPFILES)

--- Makefile_import DELETED ---