[Wxlua-commit] wxLua/modules/wxluadebug/src Makefile,1.1,1.2

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

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

Modified Files:
	Makefile 
Log Message:
Makefile cleanup


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	7 Jun 2005 04:17:40 -0000	1.1
--- Makefile	20 Nov 2005 22:28:07 -0000	1.2
***************
*** 7,33 ****
  # Makefile for wxLua library using gmake
  
! LUADIR = ../../lua
  
! WXDIR      = $(shell wx-config --prefix)
! 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 -Wall
! LDLIBS   = $(shell wx-config --libs)
! CXX      = $(shell wx-config --cxx) 
  
! APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= 
  
! LIBVERSION_CURRENT=1
! LIBVERSION_REVISION=5
! LIBVERSION_AGE=0
  
! TARGET_LIBNAME = lib$(WXLIBBASE)_wxluadebug-$(WXRELEASE)
  
! TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a
! TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
! TARGET_LIB_LINK1  = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
  TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so
  
--- 7,45 ----
  # Makefile for wxLua library 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)
  
! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= 
  
! TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE)
! TARGET_LIBDIR  = $(WXPREFIX)/lib
! 
! TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a
! TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! TARGET_LIB_LINK1  = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
  TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so
  
***************
*** 63,67 ****
  $(TARGET_LIB_SHARED): $(OBJECTS)
  	$(CXX) -shared -o $@ $(OBJECTS)
! 	cd $(WXDIR)/lib \
                  && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
                  && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
--- 75,79 ----
  $(TARGET_LIB_SHARED): $(OBJECTS)
  	$(CXX) -shared -o $@ $(OBJECTS)
! 	cd $(TARGET_LIBDIR) \
                  && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
                  && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
***************
*** 71,76 ****
  	rm -f core $(OBJECTS) $(DEPFILES) \
  	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
!               $(WXDIR)/lib/$(TARGET_LIB_LINK1) \
!               $(WXDIR)/lib/$(TARGET_LIB_LINK2) 
  
  -include $(DEPFILES)
--- 83,88 ----
  	rm -f core $(OBJECTS) $(DEPFILES) \
  	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) 
  
  -include $(DEPFILES)