Changeset 9624

Show
Ignore:
Timestamp:
09/20/08 13:55:36
Author:
trondeau
Message:

building QMAKE_INCLUDES from the CFLAGS variables; this variable is only used in the qmake project file to find qwt.h and freinds.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4

    r9618 r9624  
    6969        if test "$qwt_qwt_h" = "yes" ; then 
    7070            QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt" 
    71             QWT_INCLUDES="$QWT_INCLUDES /usr/include/qwt" 
    7271        else 
    7372            dnl otherwise, check qwt-qt4/qwt.h (as in Ubuntu) 
    …… 
    8079            if test "$qwt_qt4_qwt_h" = "yes" ; then 
    8180                QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4" 
    82                 QWT_INCLUDES="$QWT_INCLUDES /usr/include/qwt-qt4" 
    8381            else 
    8482                dnl otherwise, qwt.h wasn't found, so set the flag to no 
    …… 
    151149    dnl Export our variables 
    152150    AC_SUBST(QWT_CFLAGS) 
    153     AC_SUBST(QWT_INCLUDES) 
    154151    AC_SUBST(QWT_LIBS) 
    155152]) 

  • gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4

    r9618 r9624  
    6868        if test "$qwtplot3d_qwtplot3d_h" = "yes" ; then 
    6969            QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I/usr/include/qwtplot3d" 
    70             QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES /usr/include/qwtplot3d" 
    7170        else 
    7271            dnl otherwise, check qwtplot3d-qt4/qwtplot3d.h (as in Ubuntu) 
    …… 
    7978            if test "$qwtplot3d_qt4_qwtplot3d_h" = "yes" ; then 
    8079                QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I/usr/include/qwtplot3d-qt4" 
    81                 QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES /usr/include/qwtplot3d-qt4" 
    8280            else 
    8381                dnl otherwise, qwtplot3d.h wasn't found, so set the flag to no 
    …… 
    8886        dnl Using the user-specified include directory 
    8987        QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I$qwtplot3d_incdir" 
    90         QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES $qwtplot3d_incdir" 
    9188        AC_CHECK_HEADER( 
    9289            [$qwtplot3d_incdir/qwt3d_plot.h], 
    …… 
    151148    dnl Export our variables 
    152149    AC_SUBST(QWTPLOT3D_CFLAGS) 
    153     AC_SUBST(QWTPLOT3D_INCLUDES) 
    154150    AC_SUBST(QWTPLOT3D_LIBS) 
    155151]) 

  • gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4

    r9618 r9624  
    5959        dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes links 
    6060        dnl to QtCore and QtGui libraries) 
    61         QT_CFLAGS="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS" 
    62         QT_INCLUDES="$QWT_INCLUDES $QWTPLOT3D_INCLUDES $QTCORE_CFLAGS_ONLY_I $QTGUI_CFLAGS_ONLY_I" 
     61        QT_INCLUDES="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS" 
    6362        QT_LIBS="$QWT_LIBS $QWTPLOT3D_LIBS $QTOPENGL_LIBS" 
    64         AC_SUBST(QT_CFLAGS) 
     63 
     64        dnl Build an includes variable specifically for running qmake by extracting 
     65        dnl all includes from the QWT and QWTPLOT3D, without the -I; 
     66        dnl qmake appends the -I when processing the project file INCLUDEPATH 
     67        for i in $QWT_CFLAGS $QWTPLOT3D_CFLAGS; do 
     68            QMAKE_INCLUDES="$QMAKE_INCLUDES ${i##-I}" 
     69        done 
     70 
     71        AC_SUBST(QMAKE_INCLUDES) 
    6572        AC_SUBST(QT_INCLUDES) 
    6673        AC_SUBST(QT_LIBS) 

  • gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am

    r9618 r9624  
    3333 
    3434AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ 
    35               $(QT_CFLAGS) -Iqtspectrum -Iqtspectrum/.ui $(WITH_INCLUDES) 
     35              $(QT_INCLUDES) -Iqtspectrum -Iqtspectrum/.ui $(WITH_INCLUDES) 
    3636 
    3737SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \