Ticket #38146: patch-makefile.diff

makefile

@@ -4 +4 @@
 
 PROGRAM = KlustaKwik
 OBJS = io.o linalg.o log.o parameters.o precomputations.o util.o klustakwik.o
-CC = g++
 DEBUG = -g
 OPTIMISATIONS = -O3 -ffast-math
-CFLAGS = -Wall -c -Wno-write-strings $(OPTIMISATIONS)
-LFLAGS = -Wall
+CFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wall -c -Wno-write-strings $(OPTIMISATIONS)
+LFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wall
 
 all: executable
 
@@ -24 +23 @@
 .PHONY: all debug native executable clean
 
 executable: $(OBJS)
-        $(CC) $(LFLAGS) $(OBJS) -o $(PROGRAM)
+        $(CXX) $(LFLAGS) $(OBJS) -o $(PROGRAM)
 
 clean:
         \rm *.o $(PROGRAM)
@@ -38 +37 @@
 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) $<