Blob Blame History Raw
diff -up ./svm-toy/qt/Makefile.svm-toy-qt5 ./svm-toy/qt/Makefile
--- ./svm-toy/qt/Makefile.svm-toy-qt5	2018-07-16 00:16:58.000000000 +1000
+++ ./svm-toy/qt/Makefile	2018-07-18 18:10:40.157485623 +1000
@@ -1,13 +1,14 @@
 # use  ``export QT_SELECT=qt5'' in a command window for using qt5
 # may need to adjust the path of header files
 CXX? = g++
-INCLUDE = /usr/include/x86_64-linux-gnu/qt5
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtWidgets -I$(INCLUDE)/QtGui -I$(INCLUDE)/QtCore -fPIC -std=c++11
+INCLUDE = /usr/include/qt5
+CPP_STD ?= c++11
+CFLAGS = ${RPM_CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/QtWidgets -I$(INCLUDE)/QtGui -I$(INCLUDE)/QtCore -fPIC -std=${CPP_STD}
 LIB = -lQt5Widgets -lQt5Gui -lQt5Core
-MOC = /usr/bin/moc
+MOC ?= /usr/bin/moc-qt5

 svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
-	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy $(LIB)
+	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy-qt $(LIB)

 svm-toy.moc: svm-toy.cpp
 	$(MOC) svm-toy.cpp -o svm-toy.moc
@@ -16,4 +17,4 @@ svm-toy.moc: svm-toy.cpp
 	make -C ../.. svm.o

 clean:
-	rm -f *~ svm-toy svm-toy.moc ../../svm.o
+	rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o