Silence a printf warning for %lu on 32bits archs.

[SXSI/libbp.git] / Makefile

diff --git a/Makefile b/Makefile
index 64c98b3..f639648 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 POPCOUNT=$(shell grep -q popcnt /proc/cpuinfo && echo 1)
 
 ifeq ($(POPCOUNT), 1)
-       POPCOUNT_FLAG=-DHAS_NATIVE_POPCOUNT
+       POPCOUNT_FLAG=-DHAS_NATIVE_POPCOUNT -mpopcnt
 else
+       #POPCOUNT_FLAG=-DHAS_POPCOUNT_TABLE
        POPCOUNT_FLAG=
 endif
 
@@ -13,27 +14,33 @@ 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
 endif
 
 
+ifeq ($(PROFILE), true)
+       PROF_FLAGS=-pg -g
+else
+       PROF_FLAGS=
+endif
+
 
 INC_FLAGS=-I.
-CFLAGS= $(INC_FLAGS) $(OPT_FLAGS)
-CXXFLAGS= $(INC_FLAGS) $(OPT_FLAGS)
-CC=gcc
+CFLAGS= $(INC_FLAGS) $(OPT_FLAGS) $(PROF_FLAGS)
+CXXFLAGS= $(INC_FLAGS) $(OPT_FLAGS) $(PROF_FLAGS)
+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] $@