--- fitPlugins/fitRational0/fitRational0.pro.old 2008-02-03 15:54:39 +0300 +++ fitPlugins/fitRational0/fitRational0.pro 2008-02-03 15:55:04 +0300 @@ -12,12 +12,12 @@ DESTDIR = ../ # statically link against GSL in 3rdparty -INCLUDEPATH += ../../3rdparty/gsl/include/ -LIBS += ../../3rdparty/gsl/lib/libgsl.a -LIBS += ../../3rdparty/gsl/lib/libgslcblas.a +#INCLUDEPATH += ../../3rdparty/gsl/include/ +#LIBS += ../../3rdparty/gsl/lib/libgsl.a +#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a #dynamically link against GSL installed system-wide -#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas +unix:LIBS += -lgsl -lgslcblas target.path=/usr/lib$${libsuff}/qtiplot/plugins INSTALLS += target --- fitPlugins/fitRational1/fitRational1.pro.orig 2007-10-27 02:15:18 +0400 +++ fitPlugins/fitRational1/fitRational1.pro 2008-02-03 16:02:03 +0300 @@ -12,7 +12,7 @@ CONFIG += dll DESTDIR = ../ # statically link against GSL in 3rdparty -INCLUDEPATH += ../../3rdparty/gsl/include/ -LIBS += ../../3rdparty/gsl/lib/libgsl.a -LIBS += ../../3rdparty/gsl/lib/libgslcblas.a +#INCLUDEPATH += ../../3rdparty/gsl/include/ +#LIBS += ../../3rdparty/gsl/lib/libgsl.a +#LIBS += ../../3rdparty/gsl/lib/libgslcblas.a --- qtiplot/qtiplot.pro.orig 2007-11-29 22:34:02 +0300 +++ qtiplot/qtiplot.pro 2008-02-03 16:09:56 +0300 @@ -36,10 +36,10 @@ win32 ############################################################################# INCLUDEPATH += ../3rdparty/muparser/include -INCLUDEPATH += ../3rdparty/qwtplot3d/include -INCLUDEPATH += ../3rdparty/qwt/src +INCLUDEPATH += /usr/include/qwtplot3d +INCLUDEPATH += /usr/include/qwt INCLUDEPATH += ../3rdparty/liborigin -INCLUDEPATH += ../3rdparty/gsl/include +#INCLUDEPATH += ../3rdparty/gsl/include INCLUDEPATH += ../3rdparty/zlib123/include ##################### 3rd PARTY LIBRARIES SECTION ########################### @@ -49,18 +49,18 @@ INCLUDEPATH += ../3rdparty/zlib123 ##################### Linux (Mac OS X) ###################################### # statically link against libraries in 3rdparty -unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a -unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a -unix:LIBS += ../3rdparty/qwt/lib/libqwt.a -unix:LIBS += ../3rdparty/gsl/lib/libgsl.a -unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a +#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a +#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a +#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a +#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a +#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a # dynamically link against dependencies if they are installed system-wide -#unix:LIBS += -lmuparser -#unix:LIBS += -lqwtplot3d -#unix:LIBS += -lqwt -#unix:LIBS += -lgsl -lgslcblas +unix:LIBS += -lmuparser +unix:LIBS += -lqwtplot3d +unix:LIBS += -lqwt +unix:LIBS += -lgsl -lgslcblas ##################### Windows ############################################### #dynamically link against GSL installed system-wide -#unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas +unix:LIBS += -lgsl -lgslcblas target.path=/usr/lib$${libsuff}/qtiplot/plugins INSTALLS += target