X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-qtgui%2Fsrc%2Flib%2FMakefile.am;h=26b97d1d45f0f27426c6ed3bb74e6ec2ccff0a04;hb=ad13c00ae8cba6327851652a7d0c94a6d6316916;hp=b6c8f3f4d0a0e611a72aefe8ea0054102282ea3a;hpb=3a7863d31c47442a4691a8af781f87e2890f4aee;p=debian%2Fgnuradio

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index b6c8f3f4..26b97d1d 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -26,7 +26,6 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 
 # Only include these files in the build if qtgui passes configure checks
 # This is mostly to help make distcheck pass
-if BUILD_QT
 QMAKE_SOURCES = 				\
 	spectrumdisplayform_moc.cc		\
 	FrequencyDisplayPlot_moc.cc	 	\
@@ -35,7 +34,6 @@ QMAKE_SOURCES = 				\
 	Waterfall3DDisplayPlot_moc.cc		\
 	ConstellationDisplayPlot_moc.cc		\
 	spectrumdisplayform_ui.h
-endif
 
 EXTRA_DIST = spectrumdisplayform.ui
 
@@ -77,22 +75,14 @@ grinclude_HEADERS =			\
 	qtgui_sink_c.h			\
 	qtgui_sink_f.h
 
-if BUILD_QT
 %_moc.cc : %.h
 	$(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -p $(srcdir) $< -o $@
 
 %_ui.h : %.ui
 	$(QT_UIC_EXEC) $< -o $@
-else
-%_moc.cc : %.h
-	touch $@
-
-%_ui.h : %.ui
-	touch $@
-endif
 
 # magic flags
-libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 libgnuradio_qtgui_la_LIBADD = 		\
 	$(GNURADIO_CORE_LA)	\
@@ -122,7 +112,8 @@ include $(top_srcdir)/Makefile.swig
 # add some of the variables generated inside the Makefile.swig.gen
 BUILT_SOURCES += 		\
 	$(swig_built_sources)
-
-# Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
 endif
+
+# Do not distribute built sources, they may contain generated paths
+# which are invalid on other systems
+no_dist_files = $(BUILT_SOURCES)