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

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Jul 28 22:12:15 2010
New Revision: 628

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=628
Log:
Makefile cleanup so we can call them from Asterisk

Modified:
    asterisk/team/pabelanger/non-root/asttest/Makefile
    asterisk/team/pabelanger/non-root/asttest/lib/lua/luafilesystem/Makefile
    asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/Makefile
    asterisk/team/pabelanger/non-root/asttest/lib/lua/luasocket/src/makefile

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=628&r1=627&r2=628
==============================================================================
--- asterisk/team/pabelanger/non-root/asttest/Makefile (original)
+++ asterisk/team/pabelanger/non-root/asttest/Makefile Wed Jul 28 22:12:15 2010
@@ -85,6 +85,8 @@
 $(LUAPOSIX_OBJS): lib/lua/$(LUAPOSIX)
 	$(MAKE) -C lib/lua/$(LUAPOSIX)
 
+asttest.o: lib/lua.o lib/testsuite.o lib/testutils.o
+
 asttest: asttest.c $(OBJS) $(T_OBJS) $(L_OBJS) include/asttest/asttest.h
 	$(CC) -o $@ $(OBJS) $(L_OBJS) $(T_LIBS) $(L_MODULES) $(L_LIBS)
 

Modified: asterisk/team/pabelanger/non-root/asttest/lib/lua/luafilesystem/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/asttest/lib/lua/luafilesystem/Makefile?view=diff&rev=628&r1=627&r2=628
==============================================================================
--- asterisk/team/pabelanger/non-root/asttest/lib/lua/luafilesystem/Makefile (original)
+++ asterisk/team/pabelanger/non-root/asttest/lib/lua/luafilesystem/Makefile Wed Jul 28 22:12:15 2010
@@ -11,8 +11,11 @@
 
 lib: src/lfs.so
 
-src/lfs.so: $(OBJS)
+src/lfs.so: src/lfs.o
 	MACOS_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.so $(OBJS)
+
+src/lfs.o:
+	$(CC) $(CFLAGS) $(LIB_OPTION) -o src/lfs.o src/lfs.c
 
 install:
 	mkdir -p $(LUA_LIBDIR)

Modified: asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/Makefile?view=diff&rev=628&r1=627&r2=628
==============================================================================
--- asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/Makefile (original)
+++ asterisk/team/pabelanger/non-root/asttest/lib/lua/luaposix/Makefile Wed Jul 28 22:12:15 2010
@@ -56,6 +56,9 @@
 
 $(OBJS): modemuncher.c
 
+lposix.o:
+	$(CC) $(CPPFLAGS) $(LDFLAGS_SHARED) $(LIBS) $(LIB_OPTION) -c -o $@ lposix.c
+
 phony += tree
 tree:	$T
 	$(LUA) -l$(MYNAME) tree.lua .

Modified: asterisk/team/pabelanger/non-root/asttest/lib/lua/luasocket/src/makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root/asttest/lib/lua/luasocket/src/makefile?view=diff&rev=628&r1=627&r2=628
==============================================================================
--- asterisk/team/pabelanger/non-root/asttest/lib/lua/luasocket/src/makefile (original)
+++ asterisk/team/pabelanger/non-root/asttest/lib/lua/luasocket/src/makefile Wed Jul 28 22:12:15 2010
@@ -61,35 +61,46 @@
 $(SOCKET_A): $(SOCKET_OBJS)
 	$(AR) $(ARFLAGS) $@ $(SOCKET_OBJS)
 	$(RANLIB) $(RANLIBFLAGS) $@
-	
+#
+luasocket.o:
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o luasocket.o luasocket.c
 
-#------
-# List of dependencies
-#
-auxiliar.o: auxiliar.c auxiliar.h
-buffer.o: buffer.c buffer.h io.h timeout.h
-except.o: except.c except.h
-inet.o: inet.c inet.h socket.h io.h timeout.h usocket.h
-io.o: io.c io.h timeout.h
-luasocket.o: luasocket.c luasocket.h auxiliar.h except.h timeout.h \
-  buffer.h io.h inet.h socket.h usocket.h tcp.h udp.h select.h
-mime.o: mime.c mime.h
-options.o: options.c auxiliar.h options.h socket.h io.h timeout.h \
-  usocket.h inet.h
-select.o: select.c socket.h io.h timeout.h usocket.h select.h
-tcp.o: tcp.c auxiliar.h socket.h io.h timeout.h usocket.h inet.h \
-  options.h tcp.h buffer.h
-timeout.o: timeout.c auxiliar.h timeout.h
-udp.o: udp.c auxiliar.h socket.h io.h timeout.h usocket.h inet.h \
-  options.h udp.h
-unix.o: unix.c auxiliar.h socket.h io.h timeout.h usocket.h options.h \
-  unix.h buffer.h
-usocket.o: usocket.c socket.h io.h timeout.h usocket.h
+timeout.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o timeout.o timeout.c
+
+buffer.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o buffer.o buffer.c
+
+io.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o io.o io.c
+
+auxiliar.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o auxiliar.o auxiliar.c
+
+options.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o options.o options.c
+
+inet.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o inet.o inet.c
+
+tcp.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o tcp.o tcp.c
+
+udp.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o udp.o udp.c
+
+except.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o except.o except.c
+
+select.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o select.o select.c
+
+usocket.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o usocket.o usocket.c
+
+mime.o: 
+	$(CC) $(CFLAGS) $(LIB_OPTION) -c -o mime.o mime.c
 
 clean:
 	rm -f $(SOCKET_SO) $(SOCKET_A) $(SOCKET_OBJS) 
 	rm -f $(MIME_SO) $(UNIX_SO) $(MIME_OBJS) $(UNIX_OBJS)
-
-#------
-# End of makefile configuration
-#