From e88214a44da111e3dac789d256bd73ae2aa8b14b Mon Sep 17 00:00:00 2001 From: Laurent Claessens Date: Mon, 1 Feb 2016 03:50:55 +0100 Subject: [PATCH] Still MOC_FILE in the makefile --- makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index ac5ed07..1bb851d 100644 --- a/makefile +++ b/makefile @@ -2,6 +2,7 @@ ####### Compiler, tools and options CXX = LC_ALL=C g++ -std=c++11 #c++11 for std::to_string +MOC_BIN = /usr/lib/i386-linux-gnu/qt4/bin/moc DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES) INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -I. @@ -38,11 +39,11 @@ installation: installation.cpp installation.h moc_installation.o GitListWindow.o: moc_GitListWindow.o GitListWindow.cpp GitListWindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o GitListWindow.o GitListWindow.cpp moc_GitListWindow.cpp: GitListWindow.h - /usr/lib/i386-linux-gnu/qt4/bin/moc $(DEFINES) $(INCPATH) GitListWindow.h -o moc_GitListWindow.cpp + $(MOC_BIN) $(DEFINES) $(INCPATH) GitListWindow.h -o moc_GitListWindow.cpp moc_GitListWindow.o: moc_GitListWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_GitListWindow.o moc_GitListWindow.cpp moc_installation.cpp: installation.h - /usr/lib/i386-linux-gnu/qt4/bin/moc $(DEFINES) $(INCPATH) installation.h -o moc_installation.cpp + $(MOC_BIN) $(DEFINES) $(INCPATH) installation.h -o moc_installation.cpp moc_installation.o: moc_installation.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_installation.o moc_installation.cpp @@ -75,7 +76,7 @@ GitRepository.o: GitRepository.cpp GitRepository.h \ GitWindow.o: GitWindow.cpp GitWindow.h moc_GitWindow.o $(CXX) -c $(CXXFLAGS) $(INCPATH) -o GitWindow.o $(BOOST_SYSTEM) GitWindow.cpp moc_GitWindow.cpp: GitWindow.h - /usr/lib/i386-linux-gnu/qt4/bin/moc $(DEFINES) $(INCPATH) GitWindow.h -o moc_GitWindow.cpp + $(MOC_BIN) $(DEFINES) $(INCPATH) GitWindow.h -o moc_GitWindow.cpp moc_GitWindow.o: moc_GitWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_GitWindow.o moc_GitWindow.cpp