[Wxlua-commit] wxLua/build Makefile_wx-config.in, NONE, 1.1 Makefile_wx-config_targets.in, NONE, 1.1

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

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

Added Files:
	Makefile_wx-config.in Makefile_wx-config_targets.in 
Log Message:
Add wxAUI library and rebuild all build files
Cleanup Makefiles using wx-config and include common bits to simplify them


--- NEW FILE: Makefile_wx-config.in ---
# File:		Makefile_wx-config.in
# Author:	John Labenski
# Created:	2002
# Updated:
# Copyright: (c) 2002 John Labenski. All rights reserved.
#
# Base Makefile for wxLua using wx-config to get settings

# ----------------------------------------------------------------------------
# Your Makefile MUST define this correctly

#WXLUA_DIR    = ../../..

# --- wxLua parameters -------------------------------------------------------

WXLUA_LIBVERSION_CURRENT  = 2
WXLUA_LIBVERSION_REVISION = 8
WXLUA_LIBVERSION_AGE      = 0

# we just use the wxWidgets lib dir
WXLUA_LIBDIR = $(WXLIB_DIR)

WXLUA_WXLUASETUP_DIR = $(WXLUA_DIR)/modules/wxbind/setup

LUA = $(WXLUA_DIR)/bin/lua

# If we're using cygwin, lua might be somewhere else, try some common places
# note some other variables cygwin sets don't seem to be exported
ifeq (Cygwin, $(findstring Cygwin, $(XTERM_VERSION)))
	LUA=$(WXLUA_DIR)/bin/vc_lib/lua.exe
else
	LUA=$(WXLUA_DIR)/bin/lua
endif

# --- 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

WXSTC_LIB       = $(WXBASENAME)_stc-$(WXRELEASE)
WXXRC_LIB       = $(WXBASENAME)_xrc-$(WXRELEASE)

# ----------------------------------------------------------------------------
# The wxSTEditor library name compiled from wxCode/components/wxstedit

WXSTEDIT_LIB    = $(WXBASENAME)_stedit-$(WXRELEASE)
WXSTEDIT_DIR    = $(WXCODE)/components/wxstedit

# ----------------------------------------------------------------------------

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$(WXSTEDIT_DIR)/include -I$(WXPREFIX)/contrib/include -DLUACALL=

# This will build a shared wxLua app, dynamicly linked to .so libs
APPEXTRALIBS=$(GCC_PROFILE) -L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXXRC_LIB) -l$(WXLUAAUI_LIB) -l$(WXLUABIND_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS)

# This will build a shared wxLua app, dynamicly linked to .so libs

# This will build a static wxLua app, staticly linked to .a libs
#APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS)


# for lib targets, these are extra linker args
LIBEXTRALIBS = $(GCC_PROFILE)


RM        = rm -f
AR        = ar
AROPTIONS = rcu
RANLIB    = ranlib
LN_S      = ln -s

# ----------------------------------------------------------------------------

LUA_LIBS        = $(WXLUA_DIR)/lib/liblua.a
WXLUA_LIB       = $(WXBASENAME)_wxlua-$(WXRELEASE)
WXLUADEBUG_LIB  = $(WXBASENAME)_wxluadebug-$(WXRELEASE)
WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE)
WXLUABIND_LIB   = $(WXBASENAME)_wxluabind-$(WXRELEASE)
WXLUASTC_LIB    = $(WXBASENAME)_wxluastc-$(WXRELEASE)
WXLUAAUI_LIB    = $(WXBASENAME)_wxluaaui-$(WXRELEASE)

--- NEW FILE: Makefile_wx-config_targets.in ---
# File:		Makefile_wx-config_targets.in
# Author:	John Labenski
# Created:	2002
# Updated:
# Copyright: (c) 2002 John Labenski. All rights reserved.
#
# Base Makefile for wxLua using wx-config to get settings


# ----------------------------------------------------------------------------
# Some targets that we may like to build

Lua:
	@(cd $(WXLUA_DIR)/modules/lua && make linux)

wxLuaLib:
	@(cd $(WXLUA_DIR)/modules/wxlua/src && make)

wxLuaDebugLib:
	@(cd $(WXLUA_DIR)/modules/wxluadebug/src && make)

wxLuaSocketLib:
	@(cd $(WXLUA_DIR)/modules/wxluasocket/src && make)

wxLuaBindLib:
	@(cd $(WXLUA_DIR)/modules/wxbind/src && make)

wxSTCBindLib:
	@(cd $(WXLUA_DIR)/modules/wxbindstc/src && make)

wxAUIBindLib:
	@(cd $(WXLUA_DIR)/modules/wxbindaui/src && make)

wxStEdit:
	@(cd $(WXSTEDIT_DIR)/src && make)

cleanall:
	@(cd $(WXLUA_DIR)/modules/lua && make clean)
	@(cd $(WXLUA_DIR)/modules/wxlua/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxbind/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxbindstc/src && make clean)
	@(cd $(WXLUA_DIR)/modules/wxbindaui/src && make clean)
	@(cd $(WXLUA_DIR)/modules/luamodule/src && make clean)