X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=Makefile;h=3effd673ad0ec3b0aa59741e255a2cc420cd3043;hb=5e701a7deb86b9c9ee81f2134b91e839f90b09b0;hp=64c98b3d6670b4b74c6b1df959ff5d0ec4c91843;hpb=b94f8d72735df125b191bf5a49cba0c037278787;p=SXSI%2Flibbp.git

diff --git a/Makefile b/Makefile
index 64c98b3..3effd67 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ POPCOUNT=$(shell grep -q popcnt /proc/cpuinfo && echo 1)
 ifeq ($(POPCOUNT), 1)
 	POPCOUNT_FLAG=-DHAS_NATIVE_POPCOUNT
 else
+	#POPCOUNT_FLAG=-DHAS_POPCOUNT_TABLE
 	POPCOUNT_FLAG=
 endif
 
@@ -13,9 +14,9 @@ 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=-O4 $(POPCOUNT_FLAG) -static -flto
 endif
 
 
@@ -23,17 +24,17 @@ endif
 INC_FLAGS=-I.
 CFLAGS= $(INC_FLAGS) $(OPT_FLAGS)
 CXXFLAGS= $(INC_FLAGS) $(OPT_FLAGS)
-CC=gcc
+CC=g++
 
 
-OBJECTS_BP=bp.o darray.o bpcore.o
-LIB_BP=libbpa.a
+OBJECTS_BP=bp.o bp-utils.o bp-darray.o bp-core.o
+LIB_BP=libbp.a
 
 all: depend $(LIB_BP)
 
 $(LIB_BP): $(OBJECTS_BP)
-	@echo [BP]
-	$(HIDE) ar rcs libbp.a $(OBJECTS_BP)
+	@echo [Link] $@
+	$(HIDE) ar rcs $@ $(OBJECTS_BP)
 
 %o: %c
 	@echo [C] $@