diff options
| author | fcolin | 2009-11-09 11:19:44 +0000 |
|---|---|---|
| committer | fcolin | 2009-11-09 11:19:44 +0000 |
| commit | ec85856f7638cd518596afacd07edd43485093f9 (patch) | |
| tree | 22ffb0bfbe6889095d303b44da4dd72a411465cb /tools | |
| parent | 25dc690a34218f209023c06b7107fbd7ae36455d (diff) | |
| download | ivy-c-ec85856f7638cd518596afacd07edd43485093f9.zip ivy-c-ec85856f7638cd518596afacd07edd43485093f9.tar.gz ivy-c-ec85856f7638cd518596afacd07edd43485093f9.tar.bz2 ivy-c-ec85856f7638cd518596afacd07edd43485093f9.tar.xz | |
correction makefile compilation C++
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
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 $@ |