diff options
| author | Tom Rondeau | 2011-10-09 17:44:59 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-09 17:44:59 -0400 |
| commit | 14346c7c655a7652fc63b7613b2012995384c7b3 (patch) | |
| tree | c9c8bd24346e40656907d2ebbed3b247cee2efd5 | |
| parent | 2656ad175c70322902b960db5ac649c7bbfa0572 (diff) | |
| download | gnuradio-14346c7c655a7652fc63b7613b2012995384c7b3.tar.gz gnuradio-14346c7c655a7652fc63b7613b2012995384c7b3.tar.bz2 gnuradio-14346c7c655a7652fc63b7613b2012995384c7b3.zip | |
config: sneaking in a fix for gr-digital and adding some requirements to make an include directory to gr-qtgui.
| -rw-r--r-- | config/grc_gr_digital.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gr_qtgui.m4 | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4 index a6e2b51b5..9beb59d4b 100644 --- a/config/grc_gr_digital.m4 +++ b/config/grc_gr_digital.m4 @@ -28,7 +28,7 @@ AC_DEFUN([GRC_GR_DIGITAL],[ gr_digital_INCLUDES="\ -I\${abs_top_srcdir}/gr-digital/include \ -I\${abs_top_srcdir}/gr-digital/swig" - gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-core.la" + gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-digital.la" gr_digital_LIBDIRPATH="\${abs_top_builddir}/gr-digital/lib:\${abs_top_builddir}/gr-digital/lib/.libs" gr_digital_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-digital/swig/.libs:\${abs_top_srcdir}/gr-digital/swig" gr_digital_PYDIRPATH="\${abs_top_srcdir}/gr-digital/python" diff --git a/config/grc_gr_qtgui.m4 b/config/grc_gr_qtgui.m4 index 2204e49ae..6da61df2b 100644 --- a/config/grc_gr_qtgui.m4 +++ b/config/grc_gr_qtgui.m4 @@ -72,6 +72,14 @@ AC_DEFUN([GRC_GR_QTGUI],[ QT_MOC_EXEC=`pkg-config --variable=moc_location QtCore` QT_UIC_EXEC=`pkg-config --variable=uic_location QtCore` + gr_qtgui_INCLUDES="\ +-I\${abs_top_srcdir}/gr-qtgui/include \ +-I\${abs_top_srcdir}/gr-qtgui/swig" + gr_qtgui_LA="\${abs_top_builddir}/gr-qtgui/lib/libgnuradio-qtgui.la" + gr_qtgui_LIBDIRPATH="\${abs_top_builddir}/gr-qtgui/lib:\${abs_top_builddir}/gr-qtgui/lib/.libs" + gr_qtgui_SWIGDIRPATH="\${abs_top_builddir}/gr-digtial/lib/swig:\${abs_top_builddir}/gr-qtgui/swig/.libs:\${abs_top_srcdir}/gr-qtgui/swig" + gr_qtgui_PYDIRPATH="\${abs_top_srcdir}/gr-qtgui/python" + AC_SUBST(QMAKE_INCLUDES) AC_SUBST(QT_INCLUDES) AC_SUBST(QT_LIBS) @@ -85,10 +93,12 @@ AC_DEFUN([GRC_GR_QTGUI],[ gr-qtgui/apps/Makefile \ gr-qtgui/examples/Makefile \ gr-qtgui/grc/Makefile \ + gr-qtgui/include/Makefile \ gr-qtgui/lib/Makefile \ gr-qtgui/python/Makefile \ gr-qtgui/python/run_tests \ gr-qtgui/swig/Makefile \ + gr-qtgui/doc/Makefile \ ]) GRC_BUILD_CONDITIONAL(gr-qtgui,[ |