diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-03-23 12:09:59 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-03-23 12:09:59 +0000 |
| commit | 53a32bbc23220c52e281394d0c1c210816472c7f (patch) | |
| tree | 6150d85e6f57c08250a878613babbfebcb5671d3 | |
| parent | a6a80a0cad1ee3753ba658b8eb099a0b7341c507 (diff) | |
| download | qxmpp-53a32bbc23220c52e281394d0c1c210816472c7f.tar.gz | |
stop messing with output path
| -rw-r--r-- | examples/examples.pri | 3 | ||||
| -rw-r--r-- | qxmpp.pri | 10 | ||||
| -rw-r--r-- | src/src.pro | 5 | ||||
| -rw-r--r-- | tests/tests.pro | 3 |
4 files changed, 7 insertions, 14 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index 17d3b3b2..04136115 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -4,8 +4,7 @@ TEMPLATE = app CONFIG += console INCLUDEPATH += $$QXMPP_INCLUDEPATH -LIBS += $$QXMPP_LIBS -PRE_TARGETDEPS += $$QXMPP_LIBRARY_FILE +LIBS += -L ../../src $$QXMPP_LIBS # Symbian packaging rules symbian { @@ -21,9 +21,9 @@ symbian { # Libraries for apps which use QXmpp symbian { # Symbian needs a .lib extension to recognise the library as static - QXMPP_LIBS = -L$$QXMPP_LIBRARY_DIR -l$${QXMPP_LIBRARY_NAME}.lib + QXMPP_LIBS = -l$${QXMPP_LIBRARY_NAME}.lib } else { - QXMPP_LIBS = -L$$QXMPP_LIBRARY_DIR -l$${QXMPP_LIBRARY_NAME} + QXMPP_LIBS = -l$${QXMPP_LIBRARY_NAME} } # FIXME: we should be able to use the link_prl option to automatically pull @@ -31,12 +31,6 @@ symbian { # seem to work on win32, so we specify the dependencies here: QXMPP_LIBS += $$QXMPP_INTERNAL_LIBS -# Path of the QXmpp library file, for expressing dependency. -symbian { -} else:unix { - QXMPP_LIBRARY_FILE = $${QXMPP_LIBRARY_DIR}/lib$${QXMPP_LIBRARY_NAME}.a -} - # Installation prefix and library directory isEmpty(PREFIX) { unix:PREFIX=/usr/local diff --git a/src/src.pro b/src/src.pro index db929dcb..293d27ec 100644 --- a/src/src.pro +++ b/src/src.pro @@ -25,7 +25,9 @@ DEFINES += QT_STATICPLUGIN # Target definition TARGET = $$QXMPP_LIBRARY_NAME VERSION = $$QXMPP_VERSION -DESTDIR = $$QXMPP_LIBRARY_DIR +win32 { + DESTDIR = $$OUT_PWD +} include(base/base.pri) include(client/client.pri) @@ -41,6 +43,5 @@ INSTALLS += headers target # pkg-config support CONFIG += create_pc create_prl no_install_prl -QMAKE_PKGCONFIG_DESTDIR = $$QXMPP_LIBRARY_DIR/pkgconfig QMAKE_PKGCONFIG_LIBDIR = $$target.path QMAKE_PKGCONFIG_INCDIR = $$headers.path diff --git a/tests/tests.pro b/tests/tests.pro index 9dbfc79e..3f6457c5 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -9,5 +9,4 @@ SOURCES += tests.cpp HEADERS += tests.h INCLUDEPATH += $$QXMPP_INCLUDEPATH -LIBS += $$QXMPP_LIBS -PRE_TARGETDEPS += $$QXMPP_LIBRARY_FILE +LIBS += -L ../src $$QXMPP_LIBS |