reorg

opt/README

@@ -1,21 +1,21 @@
-The "bundle" directory is an alternative way to use uthash, utarray, utlist, 
-utstring and utvector in your programs. You can copy the bundle directory
-entirely into your own source tree, then use CFLAGS to add bundle/include
+The "libut" directory is an alternative way to use uthash, utarray, utlist, 
+utstring and utvector in your programs. You can copy the libut directory
+entirely into your own source tree, then use CFLAGS to add libut/include
 to your include-header search path (-I). 
 
 There are two upshots of this. One is that you can just #include "libut.h"
 instead of uthash.h, utarray.h, etc. So it is a convenient wrapper. 
 
-The other benefit of using the bundle is that if you do a "make" in bundle/
-it builds bundle/src/libut.a, which you can then link into your program 
-using LDFLAGS -Lbundle/src -lut. This makes the utvector available. 
+The other benefit of using the libut is that if you do a "make" in libut/
+it builds libut/src/libut.a, which you can then link into your program 
+using LDFLAGS -Llibut/src -lut. This makes the utvector available. 
 
 This also links in the plumbing that supports having a utvector of utstrings.
 
 -------------------------------------------------------------------------------
 
-NOTE: because the bundle/include contains symlinks, to copy this source into
+NOTE: because the libut/include contains symlinks, to copy this source into
       another source tree, make sure you deref symlinks to copy their contents.
       One way to do this, is to use the tar -h option:
 
- tar cjhf - bundle | (cd $DESTDIR; tar xjf -)
+ tar cjhf - libut | (cd $DESTDIR; tar xjf -)

opt/bundle/Makefile

@@ -1,11 +0,0 @@
-SUBDIRS=src tests
-all: $(SUBDIRS)
-
-.PHONY: clean $(SUBDIRS)
-
-$(SUBDIRS):
-	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
-
-clean:
-	rm -f $(OBJS) *.o
-	for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done

opt/bundle/src/Makefile → opt/libut/Makefile

@@ -1,6 +1,6 @@
 OBJS=libut.a
 all: $(OBJS) 
-INCDIR=../include
+INCDIR=./include
 CFLAGS=-I$(INCDIR)
 CFLAGS+=-Wall -Wextra
 CFLAGS+=-g
@@ -8,16 +8,20 @@ CFLAGS+=-g
 libut.a: libut.o utvector.o utmm.o
 	ar r $@ $^
 
-libut.o: libut.c $(INCDIR)/libut.h
+libut.o: src/libut.c $(INCDIR)/libut.h
 	$(CC) $(CFLAGS) -c $<
 
-utvector.o: utvector.c $(INCDIR)/utvector.h
+utvector.o: src/utvector.c $(INCDIR)/utvector.h
 	$(CC) $(CFLAGS) -c $<
 
-utmm.o: utmm.c $(INCDIR)/utmm.h
+utmm.o: src/utmm.c $(INCDIR)/utmm.h
 	$(CC) $(CFLAGS) -c $<
 
-.PHONY: clean 
+.PHONY: clean tests
 
 clean:
 	rm -f $(OBJS) *.o
+	make -C tests clean
+
+tests: libut.a
+	make -C tests 

opt/bundle/tests/Makefile → opt/libut/tests/Makefile

@@ -5,7 +5,7 @@ OBJS=$(patsubst %,%.o,$(PROGS))
 CFLAGS = -I../include
 CFLAGS += -g
 CFLAGS += -Wall -Wextra
-LDFLAGS=-lut -L../src
+LDFLAGS=-L.. -lut 
 
 TEST_TARGET=run_tests
 TESTS=./do_tests