From ec85856f7638cd518596afacd07edd43485093f9 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Mon, 9 Nov 2009 11:19:44 +0000
Subject: correction makefile compilation C++

---
 tools/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/Makefile b/tools/Makefile
index 95b696c..48c85bc 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,23 +10,23 @@ EXTRAINC=-I../src
 .c.o:
 	$(CC) $(CFLAGS) $(EXTRAINC) -c $*.c
 .cpp.o:
-	$(CPP) $(CFLAGS) $(EXTRAINC) $(BUGGY_DEBIAN_OPTION) -c $*.cpp
+	$(CXX) $(CFLAGS) $(EXTRAINC) $(BUGGY_DEBIAN_OPTION) -c $*.cpp
 
 
 all: $(TARGETS)
 omp: $(OMP_TARGET)
 
 ivyprobe: ivyprobe.o ../src/libivy.a
-	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy $(PCRELIB) $(EXTRALIB) 
+	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o  $(EXTRALIB) -livy $(PCRELIB)  
 
 ivythroughput: ivythroughput.o ../src/libivy.a
-	$(CPP)  $(CFLAGS) $(EXTRAINC) -o $@ ivythroughput.o -L. $(EXTRALIB) -livy -lpcrecpp $(PCRELIB)  
+	$(CXX)  $(CFLAGS) $(EXTRAINC) -o $@ ivythroughput.o $(EXTRALIB) -livy $(PCRELIB) -lpcrecpp  
 
 ivytestready: ivytestready.o ../src/libivy.a
-	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivytestready.o -L. $(EXTRALIB) -livy -lpcrecpp  
+	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivytestready.o $(EXTRALIB) -livy $(PCRELIB) -lpcrecpp  
 
 ivyprobe_efence: ivyprobe.o ../src/libivy.a
-	$(CPP)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy -lpcrecpp $(PCRELIB) $(EXTRALIB) -lefence
+	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o  $(EXTRALIB) -livy $(PCRELIB) -lpcrecpp   -lefence
 
 
 
@@ -34,7 +34,7 @@ ivyprobe_omp: ivyprobe.o ../src/libivy_omp.a
 	$(CC)  $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy_omp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
 
 ivythroughput_omp: ivythroughput.o ../src/libivy_omp.a
-	$(CPP)  $(CFLAGS) $(EXTRAINC) -o $@ ivythroughput.o -L. -livy_omp -lpcrecpp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
+	$(CXX)  $(CFLAGS) $(EXTRAINC) -o $@ ivythroughput.o -L. -livy_omp -lpcrecpp $(PCRELIB) $(EXTRALIB) $(OMPLIB)
 
 ivyprobe.o : ivyprobe.c 
 	$(CC)  $(CFLAGS) $(EXTRAINC) $(REGEXP) -c ivyprobe.c -o $@
-- 
cgit v1.1