[Wxlua-commit] wxLua/modules/wxbindstc/src Makefile,1.10,1.11

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

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

Modified Files:
	Makefile 
Log Message:
Add wxAUI library and rebuild all build files
Cleanup Makefiles using wx-config and include common bits to simplify them


Index: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile	12 Jun 2007 05:03:17 -0000	1.10
--- Makefile	4 Jul 2007 05:39:21 -0000	1.11
***************
*** 5,56 ****
  # Copyright: (c) 2002 Lomtick Software. All rights reserved.
  #
! # Makefile for wxLuaBinding library using gmake
! 
! # --- wxLua parameters -------------------------------------------------------
! WXLUA_LIBVERSION_CURRENT  = 2
! WXLUA_LIBVERSION_REVISION = 8
! WXLUA_LIBVERSION_AGE      = 0
! 
! WXLUA_DIR    = ../../..
! WXLUA_LIBDIR = $(WXLIB_DIR)
! WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup
  
- LUA = $(WXLUA_DIR)/bin/lua
  # ----------------------------------------------------------------------------
  
- # --- wxWidgets parameters from wx-config ------------------------------------
- WXCONFIG  := wx-config
- WXPREFIX   = $(shell $(WXCONFIG) --prefix)
- WXEXECDIR  = $(shell $(WXCONFIG) --exec-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  = $(WXEXECDIR)/lib
  # ----------------------------------------------------------------------------
  
! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall -fPIC
! LDLIBS   = $(WXLDLIBS)
! CXX      = $(WXCXX)
  
! GCC_PROFILE  = #-pg
! APPEXTRADEFS = $(GCC_PROFILE) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXLUA_WXLUASETUP_DIR) -I$(WXPREFIX)/contrib/include -DLUACALL=
! APPEXTRALIBS = $(GCC_PROFILE)
  
! WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluastc-$(WXRELEASE)
! WXBIND_TARGET_LIBDIR  = $(WXLUA_LIBDIR)
  
! 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
! AR        = ar
! AROPTIONS = rcu
! RANLIB    = ranlib
! LN_S      = ln -s
  
  HEADERS =
--- 5,30 ----
  # Copyright: (c) 2002 Lomtick Software. All rights reserved.
  #
! # Makefile for wxLua library using gmake
  
  # ----------------------------------------------------------------------------
+ # Set path to root of wxLua
+ WXLUA_DIR = ../../..
  
  # ----------------------------------------------------------------------------
+ # Include wxLua settings using wx-config for wxWidgets parameters
  
! include $(WXLUA_DIR)/build/Makefile_wx-config.in
  
! # ----------------------------------------------------------------------------
  
! TARGET_LIBNAME = lib$(WXLUASTC_LIB)
! TARGET_LIBDIR  = $(WXLUA_LIBDIR)
  
! 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
  
! # ----------------------------------------------------------------------------
  
  HEADERS =
***************
*** 63,88 ****
  DEPFILES=$(OBJECTS:.o=.d)
  
  .cpp.o:
  	$(CXX) -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) $(APPEXTRALIBS)
! 	cd $(WXBIND_TARGET_LIBDIR) \
!                 && $(RM) $(WXBIND_TARGET_LIB_LINK1) $(WXBIND_TARGET_LIB_LINK2) \
!                 && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_TARGET_LIB_LINK1) \
!                 && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_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)
--- 37,69 ----
  DEPFILES=$(OBJECTS:.o=.d)
  
+ # ----------------------------------------------------------------------------
+ 
  .cpp.o:
  	$(CXX) -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) $(LIBEXTRALIBS)
! 	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 wxLua targets using wx-config for wxWidgets parameters
! 
! include $(WXLUA_DIR)/build/Makefile_wx-config_targets.in
  
  -include $(DEPFILES)