[Wxlua-commit] wxLua/modules/wxbind/src Makefile,1.15,1.16

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv478/wxLua/modules/wxbind/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/wxbind/src/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile	17 Jun 2007 18:36:13 -0000	1.15
--- Makefile	4 Jul 2007 05:39:20 -0000	1.16
***************
*** 10,120 ****
  WXLUASETUP = wxluasetup.h

- # --- 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_WXLUASETUP_DIR) -I$(WXLUA_DIR) -I$(WXLUA_DIR)/modules -I$(WXLUA_DIR)/modules/lua/include -I$(WXPREFIX)/contrib/include -DLUACALL=
! APPEXTRALIBS = $(GCC_PROFILE)

! WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(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 =
- 
  SOURCES = \
!     ../../../modules/wxbind/src/appframe.cpp \
!     ../../../modules/wxbind/src/clipdrag.cpp \
!     ../../../modules/wxbind/src/config.cpp \
!     ../../../modules/wxbind/src/controls.cpp \
!     ../../../modules/wxbind/src/data.cpp \
!     ../../../modules/wxbind/src/datetime.cpp \
!     ../../../modules/wxbind/src/defsutil.cpp \
!     ../../../modules/wxbind/src/dialogs.cpp\
!     ../../../modules/wxbind/src/event.cpp \
!     ../../../modules/wxbind/src/file.cpp \
!     ../../../modules/wxbind/src/gdi.cpp \
!     ../../../modules/wxbind/src/geometry.cpp \
!     ../../../modules/wxbind/src/grid.cpp \
!     ../../../modules/wxbind/src/help.cpp \
!     ../../../modules/wxbind/src/html.cpp \
!     ../../../modules/wxbind/src/image.cpp \
!     ../../../modules/wxbind/src/mdi.cpp \
!     ../../../modules/wxbind/src/menutool.cpp \
!     ../../../modules/wxbind/src/picker.cpp \
!     ../../../modules/wxbind/src/print.cpp \
!     ../../../modules/wxbind/src/regex.cpp \
!     ../../../modules/wxbind/src/sizer.cpp \
!     ../../../modules/wxbind/src/socket.cpp \
!     ../../../modules/wxbind/src/thread.cpp \
!     ../../../modules/wxbind/src/wave.cpp \
!     ../../../modules/wxbind/src/windows.cpp \
!     ../../../modules/wxbind/src/wx_bind.cpp \
!     ../../../modules/wxbind/src/wxlhtmlwin.cpp \
!     ../../../modules/wxbind/src/wxlprint.cpp \
!     ../../../modules/wxbind/src/wxlua.cpp \
!     ../../../modules/wxbind/src/xml.cpp

  OBJECTS=$(SOURCES:.cpp=.o)
  DEPFILES=$(OBJECTS:.o=.d)

  .cpp.o:
  	$(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) $(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)
--- 10,100 ----
  WXLUASETUP = wxluasetup.h

  # ----------------------------------------------------------------------------
+ # 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$(WXLUABIND_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 =
  SOURCES = \
!     appframe.cpp \
!     clipdrag.cpp \
!     config.cpp \
!     controls.cpp \
!     data.cpp \
!     datetime.cpp \
!     defsutil.cpp \
!     dialogs.cpp\
!     event.cpp \
!     file.cpp \
!     gdi.cpp \
!     geometry.cpp \
!     grid.cpp \
!     help.cpp \
!     html.cpp \
!     image.cpp \
!     mdi.cpp \
!     menutool.cpp \
!     picker.cpp \
!     print.cpp \
!     regex.cpp \
!     sizer.cpp \
!     socket.cpp \
!     thread.cpp \
!     wave.cpp \
!     windows.cpp \
!     wx_bind.cpp \
!     wxlhtmlwin.cpp \
!     wxlprint.cpp \
!     wxlua.cpp \
!     xml.cpp

  OBJECTS=$(SOURCES:.cpp=.o)
  DEPFILES=$(OBJECTS:.o=.d)

+ # ----------------------------------------------------------------------------
+ 
  .cpp.o:
  	$(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) $(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)