FS-6293: fix lua to build using automake, so it works right with srcdir, and avoids the linking to .a is not portable warning

This commit is contained in:
Michael Jerris 2014-03-18 13:28:52 -04:00
parent c4d0c3e092
commit 9f7399c272
1 changed files with 13 additions and 13 deletions

View File

@ -8,24 +8,24 @@ LIBLUA_A=$(LUA_DIR)/liblua.a
AM_CFLAGS += $(CFLAGS) -D_GNU_SOURCE
mod_LTLIBRARIES = mod_lua.la
mod_lua_la_SOURCES = mod_lua.cpp freeswitch_lua.cpp mod_lua_wrap.cpp
mod_lua_la_CXXFLAGS = -I$(LUA_DIR) $(AM_CPPFLAGS)
mod_lua_la_SOURCES = mod_lua.cpp freeswitch_lua.cpp mod_lua_wrap.cpp lua/lapi.c lua/lcode.c lua/lctype.c lua/ldebug.c lua/ldo.c lua/ldump.c lua/lfunc.c lua/lgc.c lua/llex.c lua/lmem.c lua/lobject.c lua/lopcodes.c lua/lparser.c lua/lstate.c lua/lstring.c lua/ltable.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c lua/lauxlib.c lua/lbaselib.c lua/lbitlib.c lua/lcorolib.c lua/ldblib.c lua/liolib.c lua/lmathlib.c lua/loslib.c lua/lstrlib.c lua/ltablib.c lua/loadlib.c lua/linit.c
mod_lua_la_CXXFLAGS = -I$(LUA_DIR) $(AM_CPPFLAGS) -DLUA_USE_LINUX
mod_lua_la_CFLAGS = -I$(LUA_DIR) $(AM_CPPFLAGS) -DLUA_USE_LINUX
mod_lua_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_lua_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm $(AM_LDFLAGS) $(LIBLUA_A) $(SOLINK)
mod_lua_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm $(AM_LDFLAGS) $(SOLINK) #$(LIBLUA_A)
BUILT_SOURCES = $(LIBLUA_A)
$(mod_lua_la_SOURCES) : $(BUILT_SOURCES)
$(LIBLUA_A):
cd $(LUA_DIR) && $(MAKE) CC="$(CC)" AR="$(AR) rcu" CFLAGS="$(AM_CFLAGS) -DLUA_USE_LINUX -w" liblua.a
#BUILT_SOURCES = $(LIBLUA_A)
#$(mod_lua_la_SOURCES) : $(BUILT_SOURCES)
#
#$(LIBLUA_A):
# cd $(LUA_DIR) && $(MAKE) CC="$(CC)" AR="$(AR) rcu" CFLAGS="$(AM_CFLAGS) -DLUA_USE_LINUX -w" liblua.a
#luaclean:
# cd $(LUA_DIR) && $(MAKE) clean
#
#allclean: clean luaclean
reswig: swigclean lua_wrap
luaclean:
cd $(LUA_DIR) && $(MAKE) clean
allclean: clean luaclean
swigclean: clean
rm -f mod_lua_wrap.*