Lua 5.1-work15.1-work1

1 files changed, 8 insertions, 11 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 0fc318cd..805df1d2 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -4,32 +4,29 @@ LUA= ..
 
 include $(LUA)/config
 
-LIBLUA=$(LIB)/liblua.a
-ALL= bin2c min noparser luab
+ALL= min noparser luab 1
 
 all:
 	@echo 'choose a target:' $(ALL)
 
-bin2c:	bin2c.c
-	$(CC) $(CFLAGS) -o $@ $@.c
-
 min:	min.c $(LIBLUA)
-	$(CC) $(CFLAGS) -o $@ $@.c -L$(LIB) -llua
+	$(CC) $(CFLAGS) -o $@ $@.c -L$(LIB) -llua -llualib
 
 noparser: noparser.c
 	$(CC) $(CFLAGS) -I$(LUA)/src -o $@.o -c $@.c
 
-luab:	noparser $(LIBLUA)
-	$(CC) -o $@ noparser.o $(LUA)/src/lua/lua.o -L$(LIB) -llua -llualib $(EXTRA_LIBS)
+luab:	noparser
+	$(CC) -o $@ noparser.o $(LUA)/src/lua/lua.o -L$(LIB) -llua -llualib $(EXTRA_LIBS) $(DLLIB)
 	$(BIN)/luac $(LUA)/test/hello.lua
 	$@ luac.out
 	-$@ -e'a=1'
 
+1:
+	$(CC) $(CFLAGS) -I../src -I../src/lib -I../src/lua all.c $(EXTRA_LIBS) $(DLLIB)
+	./a.out $(LUA)/test/hello.lua
+
 flat:
 	cd ..; mkdir flat; mv include/*.h src/*.[ch] src/*/*.[ch] flat
 
-$(LIBLUA):
-	cd ../src; $(MAKE)
-
 clean:
 	rm -f $(ALL) a.out core *.o luac.out