X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=build%2Fmodules%2Fmodule.pri;h=cc452f85d690b2d8ae85b9473270b6a1d3deafd2;hp=9de04b0658d529c2d2343a55abd3206cfef89a97;hb=7795adca52f35204f8c354da6fcc5d8e8ee35531;hpb=d7052a3218b115ab68d24ea33e670ed26afd19ce

diff --git a/build/modules/module.pri b/build/modules/module.pri
index 9de04b06..cc452f85 100644
--- a/build/modules/module.pri
+++ b/build/modules/module.pri
@@ -1,3 +1,8 @@
+# module.pri
+# This file is included by module project files.
+
+include(../buildconf.pri)
+
 TEMPLATE = lib
 CONFIG += staticlib
 
@@ -10,7 +15,6 @@ MODNAME = $$basename(MODULE)
 MODPATH_PREFIX = $$dirname(MODULE)
 !isEmpty(MODPATH_PREFIX) {
   MODPATH_PREFIX ~= s,[^/]+,..
-  #sprintf($$MODPATH_PREFIX%1
   SRCPATH = $$MODPATH_PREFIX/$$SRCPATH
 }
 
@@ -18,9 +22,9 @@ MODPATH = $$SRCPATH/$$MODULE  # Path to the module files
 
 # Define build directories
 
-OBJECTS_DIR = $${MODNAME}.tmp
-MOC_DIR = $${MODNAME}.tmp
-UI_DIR = $${MODNAME}.tmp
+OBJECTS_DIR = $$MODNAME
+MOC_DIR =     $$MODNAME
+UI_DIR =      $$MODNAME
 
 # Load module settings (files etc.)
 
@@ -33,6 +37,10 @@ for(qtmod, QT_MOD) {
   QT *= $$qtmod
 }
 
+# Include contrib stuff
+
+include(../contrib/contrib.pri)
+
 # Set includepath for needed Quassel modules
 
 for(dep, DEPMOD) {