Cosmetic change.

[SXSI/libbp.git] / Makefile

diff --git a/Makefile b/Makefile
index ec8d5b2..3effd67 100644 (file)
--- 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,10 +24,10 @@ 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
+OBJECTS_BP=bp.o bp-utils.o bp-darray.o bp-core.o
 LIB_BP=libbp.a
 
 all: depend $(LIB_BP)