[Wxlua-commit] wxLua/modules/wxluadebug/src Makefile,1.12,1.13

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxluadebug/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/wxluadebug/src/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	12 Jun 2007 05:03:17 -0000	1.12
--- Makefile	4 Jul 2007 05:39:22 -0000	1.13
***************
*** 7,44 ****
  # Makefile for wxLua 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$(WXPREFIX)/contrib/include -DLUACALL=
! APPEXTRALIBS = $(GCC_PROFILE)
  
! TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE)
  TARGET_LIBDIR  = $(WXLUA_LIBDIR)
  
--- 7,22 ----
  # 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$(WXLUADEBUG_LIB)
  TARGET_LIBDIR  = $(WXLUA_LIBDIR)
  
***************
*** 48,56 ****
  TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so
  
! RM        = rm -f
! AR        = ar
! AROPTIONS = rcu
! RANLIB    = ranlib
! LN_S      = ln -s
  
  HEADERS = \
--- 26,30 ----
  TARGET_LIB_LINK2  = $(TARGET_LIBNAME).so
  
! # ----------------------------------------------------------------------------
  
  HEADERS = \
***************
*** 65,72 ****
  DEPFILES=$(OBJECTS:.o=.d)
  
  .cpp.o:
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all:   $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)
  
  $(TARGET_LIB_STATIC) : $(OBJECTS)
--- 39,48 ----
  DEPFILES=$(OBJECTS:.o=.d)
  
+ # ----------------------------------------------------------------------------
+ 
  .cpp.o:
  	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
  
! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED)
  
  $(TARGET_LIB_STATIC) : $(OBJECTS)
***************
*** 76,80 ****
  
  $(TARGET_LIB_SHARED): $(OBJECTS)
! 	$(CXX) -shared -o $@ $(OBJECTS) $(APPEXTRALIBS)
  	cd $(TARGET_LIBDIR) \
                  && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
--- 52,56 ----
  
  $(TARGET_LIB_SHARED): $(OBJECTS)
! 	$(CXX) -shared -o $@ $(OBJECTS) $(LIBEXTRALIBS)
  	cd $(TARGET_LIBDIR) \
                  && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \
***************
*** 88,90 ****
--- 64,71 ----
                $(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)