From f18025c099e4f69829dc4fc1732a4a9e83b3eb1d Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 17 Sep 2010 11:54:32 -0400 Subject: [PATCH] Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner. --- gr-qtgui/src/lib/Makefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 1fd199e1..4ba637ad 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -73,8 +73,6 @@ grinclude_HEADERS = \ qtgui_sink_c.h \ qtgui_sink_f.h -<<<<<<< HEAD - QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB %.moc.cc : %.h $(QT_MOC_EXEC) $(QT_MOC_FLAGS) -p $(srcdir) $< -o $@ -- 2.47.2