Move all files to the top-level directory

10 files changed, 62 insertions, 75 deletions

diff --git a/Makefile b/Makefile
index 2667da9..35de0e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,67 @@
+# Programs
+HOST=
+CC=          $(HOST)c99
+AR=          $(HOST)ar
+RANLIB=      $(HOST)ranlib
+RM=          rm -f
+MKDIR=       mkdir
+MKDIR_P=     $(MKDIR) -p
+INSTALL=     install -c -m 644
+
+# User flags
+CFLAGS=      -g -O2 -pipe
+LDFLAGS=
+
+# Internal flags
+L4B_CFLAGS=  -Wall -I. $(CFLAGS)
+L4B_LDFLAGS= $(LDFLAGS)
+
+# Installation
+DESTDIR=
+PREFIX=      /usr/local
+LIBDIR=      $(DESTDIR)$(PREFIX)/lib
+INCLUDEDIR=  $(DESTDIR)$(PREFIX)/include
+
+# Tasks definition
+lib_LIBRARIES=         libl4basic.a
+libl4basic_a_OBJECTS=  l4array.o l4array2.o l4list.o l4arg.o
+libl4basic_a_HEADERS=  $(libl4basic_a_OBJECTS:.o=.h)
+
+# Build dependencies
+l4array_o_DEPENDS=
+l4array2_o_DEPENDS=
+l4list_o_DEPENDS=
+l4arg_o_DEPENDS=       l4array.o
+
+.POSIX:
+.PHONY: all clean install install-HEADERS install-LIB \
+		uninstall deinstall remove
+.SUFFIXES: .c.o
+.c.o:
+	$(CC) $(L4B_CFLAGS) -c $< -o $@
+
+all: $(lib_LIBRARIES)
+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)
+l4list.o: l4list.c l4list.h $(l4list_o_DEPENDS)
+l4arg.o: l4arg.c l4arg.h $(l4arg_o_DEPENDS)
 
-.PHONY: all clean install uninstall deinstall remove
-all: 
-	$(MAKE) -C src all
 clean:
-	$(MAKE) -C src clean
-install:
-	$(MAKE) -C src install
-uninstall:
-	$(MAKE) -C src uninstall
+	$(RM) $(lib_LIBRARIES) $(libl4basic_a_OBJECTS)
+
+install: all install-HEADERS install-LIB
+install-LIB:
+	-$(MKDIR_P) $(LIBDIR)
+	$(INSTALL) $(lib_LIBRARIES) $(LIBDIR)
+install-HEADERS:
+	-$(MKDIR_P) $(INCLUDEDIR)
+	$(INSTALL) $(libl4basic_a_HEADERS) $(INCLUDEDIR)
 
 deinstall: uninstall
 remove: uninstall
+uninstall:
+	for i in $(lib_LIBRARIES); do $(RM) $(LIBDIR)/$$i; done
+	for i in $(libl4basic_a_HEADERS); do $(RM) $(INCLUDEDIR)/$$i; done
diff --git a/src/l4arg.c b/l4arg.c
index 9908665..9908665 100644
--- a/src/l4arg.c
+++ b/l4arg.c
diff --git a/src/l4arg.h b/l4arg.h
index 68352c8..68352c8 100644
--- a/src/l4arg.h
+++ b/l4arg.h
diff --git a/src/l4array.c b/l4array.c
index b57c021..b57c021 100644
--- a/src/l4array.c
+++ b/l4array.c
diff --git a/src/l4array.h b/l4array.h
index 192f49d..192f49d 100644
--- a/src/l4array.h
+++ b/l4array.h
diff --git a/src/l4array2.c b/l4array2.c
index 24d6db0..24d6db0 100644
--- a/src/l4array2.c
+++ b/l4array2.c
diff --git a/src/l4array2.h b/l4array2.h
index e10fc0b..e10fc0b 100644
--- a/src/l4array2.h
+++ b/l4array2.h
diff --git a/src/l4list.c b/l4list.c
index bcde31b..bcde31b 100644
--- a/src/l4list.c
+++ b/l4list.c
diff --git a/src/l4list.h b/l4list.h
index 2ad7199..2ad7199 100644
--- a/src/l4list.h
+++ b/l4list.h
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 35de0e9..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# Programs
-HOST=
-CC=          $(HOST)c99
-AR=          $(HOST)ar
-RANLIB=      $(HOST)ranlib
-RM=          rm -f
-MKDIR=       mkdir
-MKDIR_P=     $(MKDIR) -p
-INSTALL=     install -c -m 644
-
-# User flags
-CFLAGS=      -g -O2 -pipe
-LDFLAGS=
-
-# Internal flags
-L4B_CFLAGS=  -Wall -I. $(CFLAGS)
-L4B_LDFLAGS= $(LDFLAGS)
-
-# Installation
-DESTDIR=
-PREFIX=      /usr/local
-LIBDIR=      $(DESTDIR)$(PREFIX)/lib
-INCLUDEDIR=  $(DESTDIR)$(PREFIX)/include
-
-# Tasks definition
-lib_LIBRARIES=         libl4basic.a
-libl4basic_a_OBJECTS=  l4array.o l4array2.o l4list.o l4arg.o
-libl4basic_a_HEADERS=  $(libl4basic_a_OBJECTS:.o=.h)
-
-# Build dependencies
-l4array_o_DEPENDS=
-l4array2_o_DEPENDS=
-l4list_o_DEPENDS=
-l4arg_o_DEPENDS=       l4array.o
-
-.POSIX:
-.PHONY: all clean install install-HEADERS install-LIB \
-		uninstall deinstall remove
-.SUFFIXES: .c.o
-.c.o:
-	$(CC) $(L4B_CFLAGS) -c $< -o $@
-
-all: $(lib_LIBRARIES)
-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)
-l4list.o: l4list.c l4list.h $(l4list_o_DEPENDS)
-l4arg.o: l4arg.c l4arg.h $(l4arg_o_DEPENDS)
-
-clean:
-	$(RM) $(lib_LIBRARIES) $(libl4basic_a_OBJECTS)
-
-install: all install-HEADERS install-LIB
-install-LIB:
-	-$(MKDIR_P) $(LIBDIR)
-	$(INSTALL) $(lib_LIBRARIES) $(LIBDIR)
-install-HEADERS:
-	-$(MKDIR_P) $(INCLUDEDIR)
-	$(INSTALL) $(libl4basic_a_HEADERS) $(INCLUDEDIR)
-
-deinstall: uninstall
-remove: uninstall
-uninstall:
-	for i in $(lib_LIBRARIES); do $(RM) $(LIBDIR)/$$i; done
-	for i in $(libl4basic_a_HEADERS); do $(RM) $(INCLUDEDIR)/$$i; done