Initial merge of Diego's cleaned up XMLTree class.

[SXSI/XMLTree.git] / makefile

diff --git a/makefile b/makefile
index bf21063..cd4b721 100644 (file)
--- a/makefile
+++ b/makefile
@@ -7,15 +7,16 @@ OBJECTS_TCA=TextCollection/incbwt/rlcsa.a
 \r
 all: libcds text_collection XMLTree\r
 \r
-XMLTree: XMLTree.o bp.o darray.o bpcore.o $(LIBCDS_A) $(OBJECTS_TCO) $(OBJECTS_TCA)\r
+XMLTree: XMLTree.o XMLTreeBuilder.o bp.o darray.o bpcore.o\\r
+ $(LIBCDS_A) $(OBJECTS_TCO) $(OBJECTS_TCA)\r
        cp libcds/lib/libcds.a XMLTree.a\r
        rm -rf .objs\r
        mkdir .objs\r
        cd .objs; ar x ../$(OBJECTS_TCA)\r
-       ar rvcs XMLTree.a XMLTree.o bp.o darray.o bpcore.o $(OBJECTS_TCO) .objs/*.o\r
+       ar rvcs XMLTree.a XMLTree.o XMLTreeBuilder.o  bp.o darray.o bpcore.o $(OBJECTS_TCO) .objs/*.o\r
        rm -rf .objs\r
 \r
-XMLTree.o: bp.c bp.h bpcore.c XMLTree.cpp XMLTree.h\r
+XMLTree.o: bp.c bp.h bpcore.c XMLTree.cpp XMLTree.h basics.h\r
        g++ $(FLAGS) -c XMLTree.cpp\r
 \r
 bp.o: bp.c bpcore.c darray.c bp.h darray.h\r
@@ -27,6 +28,9 @@ darray.o: darray.c darray.h bpcore.c
 bpcore.o: bpcore.c\r
        g++ $(FLAGS) -c bpcore.c\r
 \r
+XMLTreeBuilder.o: XMLTree.h XMLTreeBuilder.h XMLTreeBuilder.cpp basics.h\r
+       g++ $(FLAGS) -c XMLTreeBuilder.cpp\r
+\r
 text_collection:\r
        make -C TextCollection/\r
 \r