[svn-commits] pabelanger: branch pabelanger/non-root r634 - in /asterisk/team/pabelanger/no...

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Jul 29 09:31:18 2010
New Revision: 634

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=634
Log:
Clean up Makefile, add missing header.  TODO: remove hardcoded paths.

Added:
    asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h   (with props)
Modified:
    asterisk/team/pabelanger/non-root/asttest/Makefile
    asterisk/team/pabelanger/non-root/asttest/lib/lua.c

Modified: asterisk/team/pabelanger/non-root/asttest/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/asttest/Makefile?view=diff&rev=634&r1=633&r2=634
==============================================================================
--- asterisk/team/pabelanger/non-root/asttest/Makefile (original)
+++ asterisk/team/pabelanger/non-root/asttest/Makefile Thu Jul 29 09:31:18 2010
@@ -28,10 +28,6 @@
 LUASOCKET_OBJS=lib/lua/$(LUASOCKET)/src/luasocket.a
 LUAPOSIX_OBJS=lib/lua/$(LUAPOSIX)/lposix.o
 
-LUAFILESYSTEM_HEADER=lib/lua/$(LUAFILESYSTEM)/src/lfs.h
-LUASOCKET_HEADER=lib/lua/$(LUASOCKET)/src/luasocket.h
-LUAPOSIX_HEADER=lib/lua/$(LUAPOSIX)/lposix.h
-
 LUAPOSIX_LIBS=-lcrypt
 
 # Basic set of sources and flags/libraries/includes
@@ -45,13 +41,6 @@
 all: _all 
 
 _all: asttest
-
-makeopts: configure
-	@echo "****"
-	@echo "**** The configure script must be executed before running '$(MAKE)'."
-	@echo "****               Please run \"./configure\"."
-	@echo "****"
-	@exit 1
 
 lib/lua/%_lua.h : lib/lua/%.lua tools/mkstring
 	$(LUAC) -o $(basename $<).luac $<
@@ -70,9 +59,6 @@
 
 lib/lua.o: lib/lua.c $(L_MODULES) include/asttest/lua.h include/asttest/testsuite.h include/asttest/lua/*.h
 	$(CC) $(CFLAGS) -c -o $@ \
-	-DLUAFILESYSTEM_HEADER=\"../$(LUAFILESYSTEM_HEADER)\" \
-	-DLUASOCKET_HEADER=\"../$(LUASOCKET_HEADER)\" \
-	-DLUAPOSIX_HEADER=\"../$(LUAPOSIX_HEADER)\" \
        	$<
 
 lib/lua/testlib.o: lib/lua/testlib_lua.h include/asttest/lua/testlib.h

Modified: asterisk/team/pabelanger/non-root/asttest/lib/lua.c
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/asttest/lib/lua.c?view=diff&rev=634&r1=633&r2=634
==============================================================================
--- asterisk/team/pabelanger/non-root/asttest/lib/lua.c (original)
+++ asterisk/team/pabelanger/non-root/asttest/lib/lua.c Thu Jul 29 09:31:18 2010
@@ -27,9 +27,9 @@
 #include "asttest/lua/testlib.h"
 #include "asttest/lua/proclib.h"
 
-#include LUAFILESYSTEM_HEADER
-#include LUASOCKET_HEADER
-#include LUAPOSIX_HEADER
+#include "../lib/lua/luafilesystem/src/lfs.h"
+#include "../lib/lua/luasocket/src/luasocket.h"
+#include "../lib/lua/luaposix/lposix.h"
 
 lua_State *get_lua_state(struct testsuite *ts, const char *test_name) {
 	lua_State *L = luaL_newstate();

Added: asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h?view=auto&rev=634
==============================================================================
--- asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h (added)
+++ asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h Thu Jul 29 09:31:18 2010
@@ -1,0 +1,6 @@
+#ifndef LPOSIX_H
+#define LPOSIX_H
+
+LUALIB_API int luaopen_posix (lua_State *L);
+
+#endif

Propchange: asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/lposix.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain