diff --git a/silecs-diagnostic-cpp/Makefile b/silecs-diagnostic-cpp/Makefile index 3bc73c2551d6de17643b7ab7dbf40d3a95b8b09e..cab49fc3790649dcb8a475d5d8b790df9057ba63 100644 --- a/silecs-diagnostic-cpp/Makefile +++ b/silecs-diagnostic-cpp/Makefile @@ -62,10 +62,10 @@ before_compile:: $(QT_UIC) src/silecs-diagnostic/resources/gui/displayarraydialog.ui -o src/silecs-diagnostic/generated/ui_displayarraydialog.h $(QT_UIC) src/silecs-diagnostic/resources/gui/logindialog.ui -o src/silecs-diagnostic/generated/ui_logindialog.h - $(QT_MOC) $(DEFINES) $(DEPENDENT_COMPILER_OPTIONS) src/silecs-diagnostic/diagnostictoolmainview.h -o src/silecs-diagnostic/generated/moc_diagnostictoolmainview.cpp - $(QT_MOC) $(DEFINES) $(DEPENDENT_COMPILER_OPTIONS) src/silecs-diagnostic/displayarraydialog.h -o src/silecs-diagnostic/generated/moc_displayarraydialog.cpp - $(QT_MOC) $(DEFINES) $(DEPENDENT_COMPILER_OPTIONS) src/silecs-diagnostic/logindialog.h -o src/silecs-diagnostic/generated/moc_logindialog.cpp - $(QT_MOC) $(DEFINES) $(DEPENDENT_COMPILER_OPTIONS) src/silecs-diagnostic/stderrredirect.h -o src/silecs-diagnostic/generated/moc_stderrredirect.cpp + $(QT_MOC) $(DEFINES) src/silecs-diagnostic/diagnostictoolmainview.h -o src/silecs-diagnostic/generated/moc_diagnostictoolmainview.cpp + $(QT_MOC) $(DEFINES) src/silecs-diagnostic/displayarraydialog.h -o src/silecs-diagnostic/generated/moc_displayarraydialog.cpp + $(QT_MOC) $(DEFINES) src/silecs-diagnostic/logindialog.h -o src/silecs-diagnostic/generated/moc_logindialog.cpp + $(QT_MOC) $(DEFINES) src/silecs-diagnostic/stderrredirect.h -o src/silecs-diagnostic/generated/moc_stderrredirect.cpp after_clean:: rm -f src/silecs-diagnostic/generated/* \ No newline at end of file diff --git a/silecs-diagnostic-cpp/Makefile.dep b/silecs-diagnostic-cpp/Makefile.dep index bb4a17b036d1c353878fb4ed3ebb7500e478de9b..c16f4c714660a6f15189f64dfa13403c245ca731 100644 --- a/silecs-diagnostic-cpp/Makefile.dep +++ b/silecs-diagnostic-cpp/Makefile.dep @@ -17,7 +17,7 @@ DEPENDENT_COMPILER_OPTIONS += -I$(SILECS_COMM_HOME)/include DEPENDENT_COMPILER_OPTIONS += -I$(LIBXML_PATH) DEPENDENT_COMPILER_OPTIONS += -I$(BOOST_HOME)/include DEPENDENT_COMPILER_OPTIONS += -I/usr/lib64/qt5/mkspecs/linux-g++-64 -DEPENDENT_COMPILER_OPTIONS += -I/usr/include/qt5 +DEPENDENT_COMPILER_OPTIONS += -isystem/usr/include/qt5 DEPENDENT_LINKER_OPTIONS += -L$(RBACK_HOME)/lib DEPENDENT_LINKER_OPTIONS += -L$(SILECS_COMM_HOME)/lib/$(CPU)