Huge refactoring to remove diego' C/C++ chimera code.

[SXSI/XMLTree.git] / Makefile

diff --git a/Makefile b/Makefile
index 5cc06f8..1e054aa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-INC_FLAGS=-I.. -I../libcds/includes/
+INC_FLAGS=-I.. -I../libcds/includes/ -I.
 
 
 ifeq ($(VERBOSE), true)
@@ -8,16 +8,25 @@ else
 endif
 
 ifeq ($(DEBUG), true)
-       OPT_FLAGS=-O0 -g $(POPCOUNT_FLAG) -fno-PIC -static
+       OPT_FLAGS=-O0 -g $(POPCOUNT_FLAG) -static
 else
-       OPT_FLAGS=-O4 $(POPCOUNT_FLAG) -fno-PIC -static
+       OPT_FLAGS=-O3 $(POPCOUNT_FLAG) -static -flto
 endif
 
-CXXFLAGS= -std=c++0x $(INC_FLAGS) $(OPT_FLAGS)
+ifeq ($(PROFILE), true)
+       PROF_FLAGS=-pg -g
+else
+       PROF_FLAGS=
+endif
+
+
+CXXFLAGS=-std=c++0x $(INC_FLAGS) $(OPT_FLAGS) $(PROF_FLAGS)
 CXX=g++
 
-OBJECTS_XMLTREE=XMLTree.o XMLTreeBuilder.o
-XMLTREE_A=libXMLTree.a
+#OBJECTS_XMLTREE=XMLTree.o XMLTreeBuilder.o
+#XMLTREE_A=libXMLTree.a
+OBJECTS_XMLTREE=bit-vector.o xml-tree.o xml-tree-builder.o
+XMLTREE_A=libxml-tree.a