[Wxlua-commit] wxLua/build Makefile_wx-config.in,1.4,1.5

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

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

Modified Files:
	Makefile_wx-config.in 
Log Message:
Change the names of the libs created by the Makefiles using wx-config to match 
the names created by Bakefile w/ autoconf and its configure.


Index: Makefile_wx-config.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/Makefile_wx-config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile_wx-config.in	9 Jan 2008 05:47:26 -0000	1.4
--- Makefile_wx-config.in	11 Jan 2008 06:56:04 -0000	1.5
***************
*** 68,94 ****
  # The wxSTEditor library compiled from wxCode/components/wxstedit
  
- WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
  WXSTEDIT_DIR    = $(WXCODE)/components/wxstedit
  
  # ----------------------------------------------------------------------------
  
! LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a
! WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
! WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE)
  
- WXLUABIND_LIB           = $(WXBASENAME)_wxluabind-$(WXRELEASE)
- WXLUABINDADV_LIB        = $(WXBASENAME)_wxluaadv-$(WXRELEASE)
- WXLUABINDAUI_LIB        = $(WXBASENAME)_wxluaaui-$(WXRELEASE)
- WXLUABINDBASE_LIB       = $(WXBASENAME)_wxluabase-$(WXRELEASE)
- WXLUABINDCORE_LIB       = $(WXBASENAME)_wxluacore-$(WXRELEASE)
- WXLUABINDGL_LIB         = $(WXBASENAME)_wxluagl-$(WXRELEASE)
- WXLUABINDHTML_LIB       = $(WXBASENAME)_wxluahtml-$(WXRELEASE)
- WXLUABINDMEDIA_LIB      = $(WXBASENAME)_wxluamedia-$(WXRELEASE)
- WXLUABINDNET_LIB        = $(WXBASENAME)_wxluanet-$(WXRELEASE)
- WXLUABINDRICHTEXT_LIB   = $(WXBASENAME)_wxluarichtext-$(WXRELEASE)
- WXLUABINDSTC_LIB        = $(WXBASENAME)_wxluastc-$(WXRELEASE)
- WXLUABINDXML_LIB        = $(WXBASENAME)_wxluaxml-$(WXRELEASE)
- WXLUABINDXRC_LIB        = $(WXBASENAME)_wxluaxrc-$(WXRELEASE)
  
  WXLUABINDALL_LIBS  = -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB)
--- 68,113 ----
  # The wxSTEditor library compiled from wxCode/components/wxstedit
  
  WXSTEDIT_DIR    = $(WXCODE)/components/wxstedit
+ WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
+ WXSTEDIT_LIB   := $(patsubst wx_%,wxcode_%,$(WXSTEDIT_LIB))
  
  # ----------------------------------------------------------------------------
  
! LUA_LIBS                = $(WXLUA_DIR)/lib/liblua.a
! WXLUA_LIB               = $(WXBASENAME)_wxlua-$(WXRELEASE)
! WXLUADEBUG_LIB          = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
! WXLUASOCKET_LIB         = $(WXBASENAME)_wxluasocket-$(WXRELEASE)
! 
! WXLUABINDADV_LIB        = $(WXBASENAME)_wxbindadv-$(WXRELEASE)
! WXLUABINDAUI_LIB        = $(WXBASENAME)_wxbindaui-$(WXRELEASE)
! WXLUABINDBASE_LIB       = $(WXBASENAME)_wxbindbase-$(WXRELEASE)
! WXLUABINDCORE_LIB       = $(WXBASENAME)_wxbindcore-$(WXRELEASE)
! WXLUABINDGL_LIB         = $(WXBASENAME)_wxbindgl-$(WXRELEASE)
! WXLUABINDHTML_LIB       = $(WXBASENAME)_wxbindhtml-$(WXRELEASE)
! WXLUABINDMEDIA_LIB      = $(WXBASENAME)_wxbindmedia-$(WXRELEASE)
! WXLUABINDNET_LIB        = $(WXBASENAME)_wxbindnet-$(WXRELEASE)
! WXLUABINDRICHTEXT_LIB   = $(WXBASENAME)_wxbindrichtext-$(WXRELEASE)
! WXLUABINDSTC_LIB        = $(WXBASENAME)_wxbindstc-$(WXRELEASE)
! WXLUABINDXML_LIB        = $(WXBASENAME)_wxbindxml-$(WXRELEASE)
! WXLUABINDXRC_LIB        = $(WXBASENAME)_wxbindxrc-$(WXRELEASE)
! 
! WXLUA_LIB              := $(patsubst wx_%,wxlua_%,$(WXLUA_LIB))
! WXLUADEBUG_LIB         := $(patsubst wx_%,wxlua_%,$(WXLUADEBUG_LIB))
! WXLUASOCKET_LIB        := $(patsubst wx_%,wxlua_%,$(WXLUASOCKET_LIB))
! 
! WXLUABIND_LIB          := $(patsubst wx_%,wxlua_%,$(WXLUABIND_LIB))
! WXLUABINDADV_LIB       := $(patsubst wx_%,wxlua_%,$(WXLUABINDADV_LIB))
! WXLUABINDAUI_LIB       := $(patsubst wx_%,wxlua_%,$(WXLUABINDAUI_LIB))
! WXLUABINDBASE_LIB      := $(patsubst wx_%,wxlua_%,$(WXLUABINDBASE_LIB))
! WXLUABINDCORE_LIB      := $(patsubst wx_%,wxlua_%,$(WXLUABINDCORE_LIB))
! WXLUABINDGL_LIB        := $(patsubst wx_%,wxlua_%,$(WXLUABINDGL_LIB))
! WXLUABINDHTML_LIB      := $(patsubst wx_%,wxlua_%,$(WXLUABINDHTML_LIB))
! WXLUABINDMEDIA_LIB     := $(patsubst wx_%,wxlua_%,$(WXLUABINDMEDIA_LIB))
! WXLUABINDNET_LIB       := $(patsubst wx_%,wxlua_%,$(WXLUABINDNET_LIB))
! WXLUABINDRICHTEXT_LIB  := $(patsubst wx_%,wxlua_%,$(WXLUABINDRICHTEXT_LIB))
! WXLUABINDSTC_LIB       := $(patsubst wx_%,wxlua_%,$(WXLUABINDSTC_LIB))
! WXLUABINDXML_LIB       := $(patsubst wx_%,wxlua_%,$(WXLUABINDXML_LIB))
! WXLUABINDXRC_LIB       := $(patsubst wx_%,wxlua_%,$(WXLUABINDXRC_LIB))
  
  
  WXLUABINDALL_LIBS  = -l$(WXLUABINDXRC_LIB) -l$(WXLUABINDXML_LIB) -l$(WXLUABINDSTC_LIB) -l$(WXLUABINDRICHTEXT_LIB) -l$(WXLUABINDNET_LIB) -l$(WXLUABINDMEDIA_LIB) -l$(WXLUABINDHTML_LIB) -l$(WXLUABINDGL_LIB) -l$(WXLUABINDCORE_LIB) -l$(WXLUABINDBASE_LIB) -l$(WXLUABINDAUI_LIB) -l$(WXLUABINDADV_LIB)