From 323ce65bcf5fe2c82d16cf7efd7fa3bb1fe49359 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Tue, 10 Aug 2010 16:43:28 +0000
Subject: move common definitions to qxmpp.pri

---
 examples/example.pri     |  6 +++---
 examples/example.pro     | 13 -------------
 examples/examples.pro    | 13 +++++++++++++
 qxmpp.pri                |  7 +++++++
 qxmpp.pro                |  4 +++-
 source/server/server.pro |  2 +-
 source/source.pro        |  8 ++++----
 7 files changed, 31 insertions(+), 22 deletions(-)
 delete mode 100644 examples/example.pro
 create mode 100644 examples/examples.pro
 create mode 100644 qxmpp.pri

diff --git a/examples/example.pri b/examples/example.pri
index 0875ca16..70720602 100644
--- a/examples/example.pri
+++ b/examples/example.pri
@@ -1,16 +1,16 @@
+include(../qxmpp.pri)
+
 TEMPLATE = app
 
 INCLUDEPATH += ../../source
 
 QT += network xml
 
-CONFIG += console debug_and_release
+CONFIG += console
 
 CONFIG(debug, debug|release) {
-    QXMPP_LIB = qxmpp_d
     QXMPP_DIR = ../../source/debug
 } else {
-    QXMPP_LIB = qxmpp
     QXMPP_DIR = ../../source/release
 }
 
diff --git a/examples/example.pro b/examples/example.pro
deleted file mode 100644
index c19cfde3..00000000
--- a/examples/example.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = example_0_connected\
-          example_1_echoClient\
-          example_2_rosterHandling\
-          example_3_transferHandling\
-          example_4_callHandling\
-          example_5_rpcInterface\
-          example_6_rpcClient\
-          example_7_archiveHandling\
-          tests
-
-CONFIG += debug_and_release
diff --git a/examples/examples.pro b/examples/examples.pro
new file mode 100644
index 00000000..999ee029
--- /dev/null
+++ b/examples/examples.pro
@@ -0,0 +1,13 @@
+include(../qxmpp.pri)
+
+TEMPLATE = subdirs
+
+SUBDIRS = example_0_connected\
+          example_1_echoClient\
+          example_2_rosterHandling\
+          example_3_transferHandling\
+          example_4_callHandling\
+          example_5_rpcInterface\
+          example_6_rpcClient\
+          example_7_archiveHandling\
+          tests
diff --git a/qxmpp.pri b/qxmpp.pri
new file mode 100644
index 00000000..81aff4c8
--- /dev/null
+++ b/qxmpp.pri
@@ -0,0 +1,7 @@
+CONFIG += debug_and_release
+
+CONFIG(debug, debug|release) {
+    QXMPP_LIB = qxmpp_d
+} else {
+    QXMPP_LIB = qxmpp
+}
diff --git a/qxmpp.pro b/qxmpp.pro
index 82b536fd..440f3425 100644
--- a/qxmpp.pro
+++ b/qxmpp.pro
@@ -1,6 +1,8 @@
+include(qxmpp.pri)
+
 TEMPLATE = subdirs
 
 SUBDIRS = source \
           examples
 
-CONFIG += ordered debug_and_release
+CONFIG += ordered
diff --git a/source/server/server.pro b/source/server/server.pro
index 324f07cf..55a06ac5 100644
--- a/source/server/server.pro
+++ b/source/server/server.pro
@@ -104,4 +104,4 @@ SOURCES += ../QXmppUtils.cpp \
     ../QXmppVersionIq.cpp \
     ../xmlrpc.cpp
 
-	
\ No newline at end of file
+	
diff --git a/source/source.pro b/source/source.pro
index a3bdcada..ecef1683 100644
--- a/source/source.pro
+++ b/source/source.pro
@@ -1,8 +1,9 @@
+include(../qxmpp.pri)
+
 TEMPLATE = lib
 QT += network \
     xml
-CONFIG += staticlib \
-    debug_and_release
+CONFIG += staticlib
 
 # To disable the dependency on QtGui, uncomment the following:
 # DEFINES += QXMPP_NO_GUI
@@ -14,12 +15,11 @@ CONFIG += staticlib \
 # regardless of the platform. On win32 the library is
 # automagically put in debug/release folders, so do the
 # same for other platforms.
+TARGET = $$QXMPP_LIB
 CONFIG(debug, debug|release) { 
     DESTDIR = debug
-    TARGET = qxmpp_d
 } else {
     DESTDIR = release
-    TARGET = qxmpp
 }
 
 # Header files
-- 
cgit v1.2.3