From adc0d844039b7cb7731691a665e7791fe1016201 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Tue, 10 Aug 2010 19:03:57 +0000
Subject: let qmake generate pkg-config file

---
 source/qxmpp.pc   | 11 -----------
 source/source.pro | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 source/qxmpp.pc

(limited to 'source')

diff --git a/source/qxmpp.pc b/source/qxmpp.pc
deleted file mode 100644
index 99e45fc9..00000000
--- a/source/qxmpp.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/qxmpp
-
-Name: QXmpp
-Description: QXmpp library
-Version: 0.1.91
-Requires: QtCore QtGui QtNetwork QtXml
-Libs: -L${libdir} -lqxmpp
-Cflags: -I${includedir}
diff --git a/source/source.pro b/source/source.pro
index 1d9359cb..75a1dda7 100644
--- a/source/source.pro
+++ b/source/source.pro
@@ -1,8 +1,9 @@
 include(../qxmpp.pri)
 
 TEMPLATE = lib
-QT += network \
-    xml
+
+QT += network xml
+
 CONFIG += staticlib
 
 # To disable the dependency on QtGui, uncomment the following:
@@ -11,11 +12,9 @@ CONFIG += staticlib
 # To enable support for the Speex codec, uncomment the following:
 # DEFINES += QXMPP_USE_SPEEX
 
-# Make sure the library gets built in the same location
-# regardless of the platform. On win32 the library is
-# automagically put in debug/release folders, so do the
-# same for other platforms.
+# Target definition
 TARGET = $$QXMPP_LIB
+VERSION = $$QXMPP_VERSION
 DESTDIR = $$QXMPP_LIBRARY_DIR
 
 # Header files
@@ -102,11 +101,12 @@ SOURCES += QXmppUtils.cpp \
     QXmppVCard.cpp \
     QXmppVersionIq.cpp
 
+# pkg-config support
+CONFIG += create_pc create_prl no_install_prl
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+
 # Installation
-PREFIX = /usr
 headers.files = $$HEADERS
-headers.path = $$PREFIX/include/qxmpp
-pkgconfig.files = qxmpp.pc
-pkgconfig.path = $$PREFIX/lib/pkgconfig
-target.path = $$PREFIX/lib
-INSTALLS += headers pkgconfig target
+headers.path = $$[QT_INSTALL_PREFIX]/include/qxmpp
+target.path = $$[QT_INSTALL_PREFIX]/lib
+INSTALLS += headers target
-- 
cgit v1.2.3