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

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

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

Modified Files:
	Makefile 
Log Message:
Makefile cleanup


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	20 Nov 2005 06:39:46 -0000	1.1
--- Makefile	20 Nov 2005 22:28:07 -0000	1.2
***************
*** 10,38 ****
  WXLUASETUP = luasetup.h
  
! WXCONFIG := wx-config
  
! WXDIR      = $(shell $(WXCONFIG) --prefix)
  WXBASENAME = $(shell $(WXCONFIG) --basename)
- WXLIBBASE  = $(shell $(WXCONFIG) --basename)
  WXVERSION  = $(shell $(WXCONFIG) --version)
  WXRELEASE  = $(shell $(WXCONFIG) --release)
  
! CXXFLAGS = $(shell $(WXCONFIG) --cxxflags) -MMD -g -Wall
! LDLIBS   = $(shell $(WXCONFIG) --libs)
! CXX      = $(shell $(WXCONFIG) --cxx) 
! 
! APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= 
  
! LIBVERSION_CURRENT=1
! LIBVERSION_REVISION=5
! LIBVERSION_AGE=0
  
! TARGET_LIBNAME = lib$(WXLIBBASE)_wxluabind-$(WXRELEASE)
! TARGET_LIBDIR  = $(WXDIR)/lib
  
! 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
  
  RM        = rm -f
--- 10,49 ----
  WXLUASETUP = luasetup.h
  
! # --- 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= 
  
! WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE)
! WXBIND_TARGET_LIBDIR  = $(WXPREFIX)/lib
  
! WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a
! WXBIND_TARGET_LIB_SHARED = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE)
! WXBIND_TARGET_LIB_LINK1  = $(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT)
! WXBIND_TARGET_LIB_LINK2  = $(WXBIND_TARGET_LIBNAME).so
  
  RM        = rm -f
***************
*** 89,111 ****
  	$(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<
  
! all:   $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)
  
! $(TARGET_LIB_STATIC): $(OBJECTS)   
  	@$(RM) $@
  	$(AR) $(AROPTIONS) $@ $(OBJECTS)
  	$(RANLIB) $@
  
! $(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) \
!                 && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2)
  
  clean:
  	rm -f core $(OBJECTS) $(DEPFILES) \
! 	      $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \
!               $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) 
  
  -include $(DEPFILES)
--- 100,122 ----
  	$(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $<
  
! all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED)
  
! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS)   
  	@$(RM) $@
  	$(AR) $(AROPTIONS) $@ $(OBJECTS)
  	$(RANLIB) $@
  
! $(WXBIND_TARGET_LIB_SHARED): $(OBJECTS)
  	$(CXX) -shared -o $@ $(OBJECTS)
! 	cd $(WXBIND_TARGET_LIBDIR) \
!                 && $(RM) $(WXBIND_TARGET_LIB_LINK1) $(WXBIND_TARGET_LIB_LINK2) \
!                 && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \
!                 && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(TARGET_LIB_LINK2)
  
  clean:
  	rm -f core $(OBJECTS) $(DEPFILES) \
! 	      $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \
!               $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \
!               $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2) 
  
  -include $(DEPFILES)