X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=feb8ae01eae7fe776fb4a3965a7f77d001ee3ee7;hb=HEAD;hp=36637decd6e539c9ebfa78e477017ed68d169089;hpb=03125db103d98200f7a313a38db54c56748283d1;p=SXSI%2FXMLTree.git

diff --git a/Makefile b/Makefile
index 36637de..feb8ae0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
-INC_FLAGS=-I.. -I../libcds/includes/
+INC_FLAGS=-I.. -I../libcds/includes/ -I.
 
+ifeq ($(POPCOUNT), 1)
+	POPCOUNT_FLAG=-DHAS_NATIVE_POPCOUNT -mpopcnt
+else
+	POPCOUNT_FLAG=
+endif
 
 ifeq ($(VERBOSE), true)
 	HIDE=
@@ -10,7 +15,7 @@ endif
 ifeq ($(DEBUG), true)
 	OPT_FLAGS=-O0 -g $(POPCOUNT_FLAG) -static
 else
-	OPT_FLAGS=-O4 $(POPCOUNT_FLAG) -static -flto
+	OPT_FLAGS=-O3 $(POPCOUNT_FLAG) -static
 endif
 
 ifeq ($(PROFILE), true)
@@ -23,8 +28,10 @@ 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