make alib2raw compile

alib2raw/src/tree/TreeFromRawParser.cpp

@@ -6,15 +6,12 @@
  */
 #include "TreeFromRawParser.h"
-#include "Tree.h"
-#include "TreeException.h"
-#include "ranked/RankedTree.h"
-#include "ranked/PrefixRankedTree.h"
-#include "ranked/PrefixRankedBarTree.h"
-#include "unranked/UnrankedTree.h"
-#include "../alphabet/LabeledSymbol.h"
-#include "../alphabet/BarSymbol.h"
-#include "../label/Label.h"
+#include "tree/Tree.h"
+#include "tree/TreeException.h"
+#include "tree/TreeClasses.h"
+#include "alphabet/LabeledSymbol.h"
+#include "alphabet/BarSymbol.h"
+#include "label/Label.h"
 namespace tree {

alib2raw/src/tree/TreeFromRawParser.h

@@ -8,10 +8,9 @@
 #ifndef TREE_FROM_RAW_PARSER
 #define TREE_FROM_RAW_PARSER
-#include "../sax/FromXMLParserHelper.h"
-#include "TreeFeatures.h"
+#include "sax/FromXMLParserHelper.h"
+#include "tree/TreeFeatures.h"
 #include <set>
-#include "unranked/UnrankedNode.h"
 namespace tree {

alib2raw/src/tree/TreeToRawComposer.cpp

@@ -6,8 +6,8 @@
  */
 #include "TreeToRawComposer.h"
-#include "TreeException.h"
-#include "TreeClasses.h"
+#include "tree/TreeException.h"
+#include "tree/TreeClasses.h"
 namespace tree {

alib2raw/src/tree/TreeToRawComposer.h

@@ -9,8 +9,8 @@
 #define TREE_TO_RAW_COMPOSER_H_
 #include <deque>
-#include "Tree.h"
-#include "../sax/Token.h"
+#include "tree/Tree.h"
+#include "sax/Token.h"
 #include <vector>
 namespace tree {

araw2/makefile.conf

 EXECUTABLE:=araw2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2raw/ ../alib2data/ ../alib2std/
+LINK_LIBRARIES=alib2raw alib2data alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2raw/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/

makefile

@@ -7,6 +7,7 @@ BINFOLDER = bin
 STD_LIB = alib2std
 CORE_LIB = alib2data
 STR_LIB = alib2str
+RAW_LIB = alib2raw
 ALGO_LIB = alib2algo
 ELGO_LIB = alib2elgo
 SUBDIRS_BINS = aecho2 \
@@ -63,12 +64,12 @@ endif
 SUBDIRS_WITH_MAKE = $(dir $(wildcard */makefile))
-.PHONY: $(addsuffix .all-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))  \
-	$(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
-	$(addsuffix .build-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))  \
-	$(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
-	$(addsuffix .build-debug-tests  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))  \
-	$(addsuffix .build-release-tests, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
+.PHONY: $(addsuffix .all-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))  \
+	$(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
+	$(addsuffix .build-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))  \
+	$(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
+	$(addsuffix .build-debug-tests  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))  \
+	$(addsuffix .build-release-tests, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))\
 	all-debug   build-debug   build-test-debug   unit-test-debug   clean-debug   \
 	all-release build-release build-test-release unit-test-release clean-release \
 	debug release clean doc all
@@ -129,21 +130,21 @@ clean  : clean-debug   clean-release
-all-debug   : $(addsuffix .all-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-all-release : $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-build-debug  : $(addsuffix .build-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-build-release: $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
-build-tests-debug  : $(addsuffix .build-tests-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB))
-build-tests-release: $(addsuffix .build-tests-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(ALGO_LIB) $(ELGO_LIB))
+all-debug   : $(addsuffix .all-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+all-release : $(addsuffix .all-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+build-debug  : $(addsuffix .build-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+build-release: $(addsuffix .build-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB) $(SUBDIRS_BINS))
+build-tests-debug  : $(addsuffix .build-tests-debug  , $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB))
+build-tests-release: $(addsuffix .build-tests-release, $(STD_LIB) $(CORE_LIB) $(STR_LIB) $(RAW_LIB) $(ALGO_LIB) $(ELGO_LIB))
@@ -156,7 +157,10 @@ $(addsuffix .all-debug, $(CORE_LIB)): $(addsuffix .all-debug, $(STD_LIB))
 $(addsuffix .all-debug, $(STR_LIB)): $(addsuffix .all-debug, $(CORE_LIB))
 	$(MAKE) debug -C $(basename $@)
-$(addsuffix .all-debug, $(ALGO_LIB)): $(addsuffix .all-debug, $(STR_LIB))
+$(addsuffix .all-debug, $(RAW_LIB)): $(addsuffix .all-debug, $(STR_LIB))
+	$(MAKE) debug -C $(basename $@)
+
+$(addsuffix .all-debug, $(ALGO_LIB)): $(addsuffix .all-debug, $(RAW_LIB))
 	$(MAKE) debug -C $(basename $@)
 $(addsuffix .all-debug, $(ELGO_LIB)): $(addsuffix .all-debug, $(ALGO_LIB))
@@ -176,7 +180,10 @@ $(addsuffix .all-release, $(CORE_LIB)): $(addsuffix .all-release, $(STD_LIB))
 $(addsuffix .all-release, $(STR_LIB)): $(addsuffix .all-release, $(CORE_LIB))
 	$(MAKE) release -C $(basename $@)
-$(addsuffix .all-release, $(ALGO_LIB)): $(addsuffix .all-release, $(STR_LIB))
+$(addsuffix .all-release, $(RAW_LIB)): $(addsuffix .all-release, $(STR_LIB))
+	$(MAKE) release -C $(basename $@)
+
+$(addsuffix .all-release, $(ALGO_LIB)): $(addsuffix .all-release, $(RAW_LIB))
 	$(MAKE) release -C $(basename $@)
 $(addsuffix .all-release, $(ELGO_LIB)): $(addsuffix .all-release, $(ALGO_LIB))
@@ -196,7 +203,10 @@ $(addsuffix .build-debug, $(CORE_LIB)): $(addsuffix .build-debug, $(STD_LIB))
 $(addsuffix .build-debug, $(STR_LIB)): $(addsuffix .build-debug, $(CORE_LIB))
 	$(MAKE) build-debug -C $(basename $@)
-$(addsuffix .build-debug, $(ALGO_LIB)): $(addsuffix .build-debug, $(STR_LIB))
+$(addsuffix .build-debug, $(RAW_LIB)): $(addsuffix .build-debug, $(STR_LIB))
+	$(MAKE) build-debug -C $(basename $@)
+
+$(addsuffix .build-debug, $(ALGO_LIB)): $(addsuffix .build-debug, $(RAW_LIB))
 	$(MAKE) build-debug -C $(basename $@)
 $(addsuffix .build-debug, $(ELGO_LIB)): $(addsuffix .build-debug, $(ALGO_LIB))
@@ -216,7 +226,10 @@ $(addsuffix .build-release, $(CORE_LIB)): $(addsuffix .build-release, $(STD_LIB)
 $(addsuffix .build-release, $(STR_LIB)): $(addsuffix .build-release, $(CORE_LIB))
 	$(MAKE) build-release -C $(basename $@)
-$(addsuffix .build-release, $(ALGO_LIB)): $(addsuffix .build-release, $(STR_LIB))
+$(addsuffix .build-release, $(RAW_LIB)): $(addsuffix .build-release, $(STR_LIB))
+	$(MAKE) build-release -C $(basename $@)
+
+$(addsuffix .build-release, $(ALGO_LIB)): $(addsuffix .build-release, $(RAW_LIB))
 	$(MAKE) build-release -C $(basename $@)
 $(addsuffix .build-release, $(ELGO_LIB)): $(addsuffix .build-release, $(ALGO_LIB))
@@ -236,7 +249,10 @@ $(addsuffix .build-tests-debug, $(CORE_LIB)): $(addsuffix .build-tests-debug, $(
 $(addsuffix .build-tests-debug, $(STR_LIB)): $(addsuffix .build-tests-debug, $(CORE_LIB)) $(addsuffix .build-debug, $(STR_LIB))
 	$(MAKE) build-tests-debug -C $(basename $@)
-$(addsuffix .build-tests-debug, $(ALGO_LIB)): $(addsuffix .build-tests-debug, $(STR_LIB)) $(addsuffix .build-debug, $(ALGO_LIB))
+$(addsuffix .build-tests-debug, $(RAW_LIB)): $(addsuffix .build-tests-debug, $(STR_LIB)) $(addsuffix .build-debug, $(RAW_LIB))
+	$(MAKE) build-tests-debug -C $(basename $@)
+
+$(addsuffix .build-tests-debug, $(ALGO_LIB)): $(addsuffix .build-tests-debug, $(RAW_LIB)) $(addsuffix .build-debug, $(ALGO_LIB))
 	$(MAKE) build-tests-debug -C $(basename $@)
 $(addsuffix .build-tests-debug, $(ELGO_LIB)): $(addsuffix .build-tests-debug, $(ALGO_LIB)) $(addsuffix .build-debug, $(ELGO_LIB))
@@ -253,7 +269,10 @@ $(addsuffix .build-tests-release, $(CORE_LIB)): $(addsuffix .build-tests-release
 $(addsuffix .build-tests-release, $(STR_LIB)): $(addsuffix .build-tests-release, $(CORE_LIB)) $(addsuffix .build-release, $(STR_LIB))
 	$(MAKE) build-tests-release -C $(basename $@)
-$(addsuffix .build-tests-release, $(ALGO_LIB)): $(addsuffix .build-tests-release, $(STR_LIB)) $(addsuffix .build-release, $(ALGO_LIB))
+$(addsuffix .build-tests-release, $(RAW_LIB)): $(addsuffix .build-tests-release, $(STR_LIB)) $(addsuffix .build-release, $(RAW_LIB))
+	$(MAKE) build-tests-release -C $(basename $@)
+
+$(addsuffix .build-tests-release, $(ALGO_LIB)): $(addsuffix .build-tests-release, $(RAW_LIB)) $(addsuffix .build-release, $(ALGO_LIB))
 	$(MAKE) build-tests-release -C $(basename $@)
 $(addsuffix .build-tests-release, $(ELGO_LIB)): $(addsuffix .build-tests-release, $(ALGO_LIB)) $(addsuffix .build-release, $(ELGO_LIB))