casa-mp-base

--- makefile.orig   2012-07-04 11:39:30.000000000 -0400

+++ makefile    2013-02-21 23:24:22.000000000 -0500

@@ -7,8 +7,8 @@

 CC = g++

 DEBUG = -g

 OPTIMISATIONS = -O3 -ffast-math

-CFLAGS = -Wall -c -Wno-write-strings $(OPTIMISATIONS)

-LFLAGS = -Wall

+CFLAGS = -Wall -c -Wno-write-strings $(OPTIMISATIONS) $(CXXFLAGS)

+LFLAGS = -Wall $(LDFLAGS)

 all: executable

@@ -24,7 +24,7 @@

 .PHONY: all debug native executable clean

 executable: $(OBJS)

-   $(CC) $(LFLAGS) $(OBJS) -o $(PROGRAM)

+   $(CXX) $(LFLAGS) $(OBJS) -o $(PROGRAM)

 clean:

    \rm *.o $(PROGRAM)

@@ -38,22 +38,22 @@

 util.h: numerics.h

 io.o: io.cpp klustakwik.h

-   $(CC) $(CFLAGS) $<

+   $(CXX) $(CFLAGS) $<

 linalg.o: linalg.cpp linalg.h

-   $(CC) $(CFLAGS) $<

+   $(CXX) $(CFLAGS) $<

 log.o: log.cpp log.h parameters.h

-   $(CC) $(CFLAGS) $<

+   $(CXX) $(CFLAGS) $<

 klustakwik.o: klustakwik.cpp klustakwik.h

-   $(CC) $(CFLAGS) $<

+   $(CXX) $(CFLAGS) $<

 parameters.o: parameters.cpp parameters.h log.h util.h

-   $(CC) $(CFLAGS) $<

+   $(CXX) $(CFLAGS) $<

 precomputations.o: precomputations.cpp klustakwik.h

-   $(CC) $(CFLAGS) $<

+   $(CXX) $(CFLAGS) $<

 util.o: util.cpp util.h

-   $(CC) $(CFLAGS) $<

+   $(CXX) $(CFLAGS) $<