commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r9618 - in gnuradio/branches/developers/trondeau/qtgui

From: trondeau
Subject: [Commit-gnuradio] r9618 - in gnuradio/branches/developers/trondeau/qtgui: config gr-qtgui/src/lib gr-qtgui/src/lib/qtspectrum
Date: Sat, 20 Sep 2008 12:17:03 -0600 (MDT) 
Author: trondeau
Date: 2008-09-20 12:17:01 -0600 (Sat, 20 Sep 2008)
New Revision: 9618

Modified:
   gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
   gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4
   gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/GNUmakefile
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro
Log:
Adding includes directives for qmake project file.

Modified: gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4        
2008-09-20 16:27:16 UTC (rev 9617)
+++ gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4        
2008-09-20 18:17:01 UTC (rev 9618)
@@ -68,6 +68,7 @@
         dnl If it was found, set the flags and move on
         if test "$qwt_qwt_h" = "yes" ; then
             QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt"
+            QWT_INCLUDES="$QWT_INCLUDES /usr/include/qwt"
         else
             dnl otherwise, check qwt-qt4/qwt.h (as in Ubuntu)
             AC_CHECK_HEADER(
@@ -78,6 +79,7 @@
             dnl if it was found, set the flags and move on
             if test "$qwt_qt4_qwt_h" = "yes" ; then
                 QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4"
+                QWT_INCLUDES="$QWT_INCLUDES /usr/include/qwt-qt4"
             else
                 dnl otherwise, qwt.h wasn't found, so set the flag to no
                 libqwt_ok=no
@@ -148,5 +150,6 @@
 
     dnl Export our variables
     AC_SUBST(QWT_CFLAGS)
+    AC_SUBST(QWT_INCLUDES)
     AC_SUBST(QWT_LIBS)
 ])

Modified: gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4  
2008-09-20 16:27:16 UTC (rev 9617)
+++ gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4  
2008-09-20 18:17:01 UTC (rev 9618)
@@ -67,6 +67,7 @@
         dnl If it was found, set the flags and move on
         if test "$qwtplot3d_qwtplot3d_h" = "yes" ; then
             QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I/usr/include/qwtplot3d"
+            QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES /usr/include/qwtplot3d"
         else
             dnl otherwise, check qwtplot3d-qt4/qwtplot3d.h (as in Ubuntu)
             AC_CHECK_HEADER(
@@ -77,6 +78,7 @@
             dnl if it was found, set the flags and move on
             if test "$qwtplot3d_qt4_qwtplot3d_h" = "yes" ; then
                 QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS 
-I/usr/include/qwtplot3d-qt4"
+                QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES 
/usr/include/qwtplot3d-qt4"
             else
                 dnl otherwise, qwtplot3d.h wasn't found, so set the flag to no
                 libqwtplot3d_ok=no
@@ -85,6 +87,7 @@
     else
        dnl Using the user-specified include directory
        QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I$qwtplot3d_incdir"
+       QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES $qwtplot3d_incdir"
         AC_CHECK_HEADER(
             [$qwtplot3d_incdir/qwt3d_plot.h],
            [],
@@ -147,5 +150,6 @@
 
     dnl Export our variables
     AC_SUBST(QWTPLOT3D_CFLAGS)
+    AC_SUBST(QWTPLOT3D_INCLUDES)
     AC_SUBST(QWTPLOT3D_LIBS)
 ])

Modified: gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-09-20 16:27:16 UTC (rev 9617)
+++ gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-09-20 18:17:01 UTC (rev 9618)
@@ -57,9 +57,11 @@
         fi
 
        dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes 
links
-       dnl to QtCore and QtGui libraries
-       QT_INCLUDES="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
+       dnl to QtCore and QtGui libraries)
+       QT_CFLAGS="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
+        QT_INCLUDES="$QWT_INCLUDES $QWTPLOT3D_INCLUDES $QTCORE_CFLAGS_ONLY_I 
$QTGUI_CFLAGS_ONLY_I"
        QT_LIBS="$QWT_LIBS $QWTPLOT3D_LIBS $QTOPENGL_LIBS"
+        AC_SUBST(QT_CFLAGS)
         AC_SUBST(QT_INCLUDES)
        AC_SUBST(QT_LIBS)
     fi
@@ -68,6 +70,7 @@
         gr-qtgui/Makefile \
         gr-qtgui/src/Makefile \
         gr-qtgui/src/lib/Makefile \
+       gr-qtgui/src/lib/qtspectrum/specDisplay.pro \
         gr-qtgui/src/python/Makefile \
     ])
 

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am    
2008-09-20 16:27:16 UTC (rev 9617)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am    
2008-09-20 18:17:01 UTC (rev 9618)
@@ -24,7 +24,7 @@
 SUBDIRS=qtspectrum
 DIST_SUBDIRS=qtspectrum
 
-# Install this stuff so that it ends up as the gnuradio.vocoder module
+# 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
 
@@ -32,7 +32,7 @@
 ourlibdir    = $(grpyexecdir)/qtgui
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-              $(QT_INCLUDES) -Iqtspectrum -Iqtspectrum/.ui $(WITH_INCLUDES)
+              $(QT_CFLAGS) -Iqtspectrum -Iqtspectrum/.ui $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
@@ -116,6 +116,8 @@
 
 MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
 
+EXTRA_DIST=qtspectrum/GNUmakefile
+
 # Don't distribute output of swig
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/GNUmakefile
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/GNUmakefile
 2008-09-20 16:27:16 UTC (rev 9617)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/GNUmakefile
 2008-09-20 18:17:01 UTC (rev 9618)
@@ -1,5 +1,5 @@
 
-all: ;
+all distcheck: ;
        qmake-qt4 specDisplay.pro
        make -f Makefile
 
@@ -9,4 +9,6 @@
 distclean: ;
        make -f Makefile distclean
 
-check dist distcheck: 
+distdir: ;
+
+check dist:

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro
     2008-09-20 16:27:16 UTC (rev 9617)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro
     2008-09-20 18:17:01 UTC (rev 9618)
@@ -3,10 +3,9 @@
 
 CONFIG += qt warn_on release thread opengl qwt qwtplot3d
 
-INCLUDEPATH += /usr/include/qwt /usr/include/qwtplot3d
+INCLUDEPATH +=  /usr/include/qwt-qt4  /usr/include/qwtplot3d-qt4  
+LIBS +=  -lqwt  -lqwtplot3d-qt4 -pthread -L/usr/X11R6/lib -lQtOpenGL -lGLU 
-lGL -lQtGui -laudio -lXt -lpng -lSM -lICE -lXi -lXrender -lXrandr -lXfixes 
-lXcursor -lXinerama -lfreetype -lXext -lX11 -lQtCore -lfontconfig -lz -lm 
-lgthread-2.0 -lrt -lglib-2.0 -lpthread -ldl  
 
-LIBS += -lqwt -lqwtplot3d-qt4
-
 HEADERS = FrequencyDisplayPlot.hpp \
        highResTimeFunctions.hpp \
        plot_waterfall.hpp \
reply via email to
[Prev in Thread] Current Thread [Next in Thread]