Rewrite dynamic array (LbsArray) and add test suitel4basic-unstable-1.91

1 files changed, 35 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 1a790fc..23564d2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,8 @@ CFLAGS=      -g -O2 -pipe
 LDFLAGS=
 
 # Internal flags
-L4B_CFLAGS=  -Wall -I. $(CFLAGS)
-L4B_LDFLAGS= $(LDFLAGS)
+M_CFLAGS=    -Wall -I. $(CFLAGS)
+M_LDFLAGS=   $(LDFLAGS)
 
 # Installation
 DESTDIR=
@@ -27,33 +27,59 @@ INCLUDEDIR=  $(DESTDIR)$(PREFIX)/include
 
 # Tasks definition
 lib_LIBRARIES=         libl4basic.a
-libl4basic_a_OBJECTS=  l4array.o l4array2.o l4list.o l4arg.o
+libl4basic_a_OBJECTS=  l4array.o l4array2.o l4file.o l4list.o l4arg.o
 libl4basic_a_HEADERS=  $(libl4basic_a_OBJECTS:.o=.h)
 
+check_PROGRAMS=        test-array test-array2 test-file test-list test-arg
+check_OBJECTS=         $(check_PROGRAMS:=.o)
+
 # Build dependencies
-l4array_o_DEPENDS=
-l4array2_o_DEPENDS=
-l4list_o_DEPENDS=
-l4arg_o_DEPENDS=       l4array.o
+l4array_o_DEPENDS=     l4common.h
+l4array2_o_DEPENDS=    l4common.h
+l4file_o_DEPENDS=      l4common.h l4array.o
+l4list_o_DEPENDS=      l4common.h
+l4arg_o_DEPENDS=       l4common.h l4array.o
+
+test_array_o_DEPENDS=  l4array.o
+test_array2_o_DEPENDS= l4array2.o
+test_file_o_DEPENDS=   l4file.o
+test_list_o_DEPENDS=   l4list.o
+test_arg_o_DEPENDS=    l4arg.o
 
 .POSIX:
 .PHONY: all clean install install-HEADERS install-LIB \
 		uninstall deinstall remove
 .SUFFIXES: .c.o
 .c.o:
-	$(CC) $(L4B_CFLAGS) -c $< -o $@
+	$(CC) $(M_CFLAGS) -c $< -o $@
 
 all: $(lib_LIBRARIES)
+check: $(check_PROGRAMS)
+	for i in $(check_PROGRAMS); do ./$$i || exit 1; done
 libl4basic.a: $(libl4basic_a_OBJECTS)
 	$(AR) rcs $@ $(libl4basic_a_OBJECTS)
 	$(RANLIB) $@
 l4array.o: l4array.c l4array.h $(l4array_o_DEPENDS) 
 l4array2.o: l4array2.c l4array2.h $(l4array2_o_DEPENDS)
+l4file.o: l4file.c l4file.h $(l4file_o_DEPENDS)
 l4list.o: l4list.c l4list.h $(l4list_o_DEPENDS)
 l4arg.o: l4arg.c l4arg.h $(l4arg_o_DEPENDS)
 
+test-array: test-array.o $(test_array_o_DEPENDS)
+	$(CC) $(M_CFLAGS) test-array.o $(test_array_o_DEPENDS) -o $@ $(M_LDFLAGS)
+test-array2: test-array2.o $(test_array2_o_DEPENDS)
+	$(CC) $(M_CFLAGS) test-array2.o $(test_array2_o_DEPENDS) -o $@ $(M_LDFLAGS)
+test-file: test-file.o $(test_file_o_DEPENDS)
+	$(CC) $(M_CFLAGS) test-file.o $(test_file_o_DEPENDS) -o $@ $(M_LDFLAGS)
+test-list: test-list.o $(test_list_o_DEPENDS)
+	$(CC) $(M_CFLAGS) test-list.o $(test_list_o_DEPENDS) -o $@ $(M_LDFLAGS)
+test-arg: test-arg.o $(test_arg_o_DEPENDS)
+	$(CC) $(M_CFLAGS) test-arg.o $(test_arg_o_DEPENDS) -o $@ $(M_LDFLAGS)
+
 clean:
-	$(RM) $(lib_LIBRARIES) $(libl4basic_a_OBJECTS)
+	-$(RM) \
+		$(lib_LIBRARIES) $(libl4basic_a_OBJECTS) \
+		$(check_PROGRAMS) $(check_OBJECTS)
 
 install: all install-HEADERS install-LIB
 install-LIB: