projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'flattopwindow' of http://gnuradio.org/git/matt into flattop
[debian/gnuradio]
/
gr-qtgui
/
src
/
lib
/
Makefile.am
diff --git
a/gr-qtgui/src/lib/Makefile.am
b/gr-qtgui/src/lib/Makefile.am
index 41281e68768885195dda89953a8182f3fc09aed8..814bee1369ef033798263482e6eac1c3aff1e5e2 100644
(file)
--- a/
gr-qtgui/src/lib/Makefile.am
+++ b/
gr-qtgui/src/lib/Makefile.am
@@
-21,66
+21,35
@@
include $(top_srcdir)/Makefile.common
include $(top_srcdir)/Makefile.common
-# Install this stuff so that it ends up as the gnuradio.qtgui module
-# This usually ends up at:
-# ${prefix}/lib/python${python_version}/site-packages/gnuradio/qtgui
-
-ourpythondir = $(grpythondir)/qtgui
-ourlibdir = $(grpyexecdir)/qtgui
-
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
$(QT_INCLUDES) -I. $(WITH_INCLUDES)
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
$(QT_INCLUDES) -I. $(WITH_INCLUDES)
-ALL_IFILES = \
- $(LOCAL_IFILES) \
- $(NON_LOCAL_IFILES)
-
-NON_LOCAL_IFILES = \
- $(GNURADIO_I)
-
-LOCAL_IFILES = \
- $(srcdir)/qtgui.i
-
-# These files are built by SWIG. The first is the C++ glue.
-# The second is the python wrapper that loads the shared library
-# and knows how to call our extensions.
-
# Only include these files in the build if qtgui passes configure checks
# This is mostly to help make distcheck pass
# 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 \
TimeDomainDisplayPlot_moc.cc \
WaterfallDisplayPlot_moc.cc \
Waterfall3DDisplayPlot_moc.cc \
QMAKE_SOURCES = \
spectrumdisplayform_moc.cc \
FrequencyDisplayPlot_moc.cc \
TimeDomainDisplayPlot_moc.cc \
WaterfallDisplayPlot_moc.cc \
Waterfall3DDisplayPlot_moc.cc \
+ ConstellationDisplayPlot_moc.cc \
spectrumdisplayform_ui.h
spectrumdisplayform_ui.h
-endif
EXTRA_DIST = spectrumdisplayform.ui
EXTRA_DIST = spectrumdisplayform.ui
-BUILT_SOURCES = \
- qtgui.cc \
- qtgui.py \
- $(QMAKE_SOURCES)
-
-# This gets qtgui.py installed in the right place
-ourpython_PYTHON = \
- qtgui.py
-
-# Build the library for Python module to link against
-ourlib_LTLIBRARIES = _qtgui.la
+BUILT_SOURCES = $(QMAKE_SOURCES)
# Build the normal library for C++ apps to link against
# Build the normal library for C++ apps to link against
-lib_LTLIBRARIES = libqtgui.la
+lib_LTLIBRARIES = lib
gnuradio-
qtgui.la
# These are the source files that go into the shared library
# These are the source files that go into the shared library
-lib
qtgui_la_SOURCES =
\
+lib
gnuradio_qtgui_la_SOURCES =
\
FrequencyDisplayPlot.cc \
TimeDomainDisplayPlot.cc \
WaterfallDisplayPlot.cc \
Waterfall3DDisplayPlot.cc \
waterfallGlobalData.cc \
FrequencyDisplayPlot.cc \
TimeDomainDisplayPlot.cc \
WaterfallDisplayPlot.cc \
Waterfall3DDisplayPlot.cc \
waterfallGlobalData.cc \
+ ConstellationDisplayPlot.cc \
spectrumdisplayform.cc \
SpectrumGUIClass.cc \
spectrumUpdateEvents.cc \
spectrumdisplayform.cc \
SpectrumGUIClass.cc \
spectrumUpdateEvents.cc \
@@
-89,10
+58,6
@@
libqtgui_la_SOURCES = \
qtgui_sink_c.cc \
qtgui_sink_f.cc
qtgui_sink_c.cc \
qtgui_sink_f.cc
-_qtgui_la_SOURCES = \
- $(libqtgui_la_SOURCES) \
- qtgui.cc
-
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
FrequencyDisplayPlot.h \
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
FrequencyDisplayPlot.h \
@@
-100,6
+65,7
@@
grinclude_HEADERS = \
WaterfallDisplayPlot.h \
Waterfall3DDisplayPlot.h \
waterfallGlobalData.h \
WaterfallDisplayPlot.h \
Waterfall3DDisplayPlot.h \
waterfallGlobalData.h \
+ ConstellationDisplayPlot.h \
highResTimeFunctions.h \
plot_waterfall.h \
spectrumdisplayform.h \
highResTimeFunctions.h \
plot_waterfall.h \
spectrumdisplayform.h \
@@
-109,49
+75,45
@@
grinclude_HEADERS = \
qtgui_sink_c.h \
qtgui_sink_f.h
qtgui_sink_c.h \
qtgui_sink_f.h
-if BUILD_QT
%_moc.cc : %.h
%_moc.cc : %.h
- $(QT_MOC_EXEC) -DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB $< -o $@
+ $(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 $@
%_ui.h : %.ui
$(QT_UIC_EXEC) $< -o $@
-else
-%_moc.cc : %.h
- touch $@
-
-%_ui.h : %.ui
- touch $@
-endif
# magic flags
# magic flags
-_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-libqtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-# link the library against the c++ standard library
-_qtgui_la_LIBADD = \
- $(PYTHON_LDFLAGS) \
+libgnuradio_qtgui_la_LIBADD = \
$(GNURADIO_CORE_LA) \
-lstdc++ \
$(QT_LIBS)
$(GNURADIO_CORE_LA) \
-lstdc++ \
$(QT_LIBS)
+if PYTHON
+##############################
+# SWIG interface and library
-libqtgui_la_LIBADD = \
- $(GNURADIO_CORE_LA) \
- -lstdc++ \
- $(QT_LIBS)
+TOP_SWIG_IFILES = \
+ qtgui.i
-qtgui.cc qtgui.py: $(ALL_IFILES)
- $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module qtgui \
- -o qtgui.cc $(LOCAL_IFILES)
+# Install so that they end up available as:
+# import gnuradio.qtgui
+# This ends up at:
+# ${prefix}/lib/python${python_version}/site-packages/gnuradio
+qtgui_pythondir_category = \
+ gnuradio/qtgui
-#
These swig headers get installed in ${prefix}/include/gnuradio/swig
-
swiginclude_HEADERS =
\
- $(LOCAL_IFILES)
+#
additional libraries for linking with the SWIG-generated library
+
qtgui_la_swig_libadd =
\
+ libgnuradio-qtgui.la
+include $(top_srcdir)/Makefile.swig
-MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES += \
+ $(swig_built_sources)
+endif
-# Don't distribute output of swig
-dist-hook:
- @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
- @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
+# Do not distribute built sources, they may contain generated paths
+# which are invalid on other systems
+no_dist_files = $(BUILT_SOURCES)