Various stuff, cosmetic fixes, fiddling with IrcUsers and NetworkInfos in Buffers.

[quassel.git] / build / modules / module.pri

diff --git a/build/modules/module.pri b/build/modules/module.pri
index 900f303..cc452f8 100644 (file)
--- a/build/modules/module.pri
+++ b/build/modules/module.pri
@@ -15,7 +15,6 @@ MODNAME = $$basename(MODULE)
 MODPATH_PREFIX = $$dirname(MODULE)
 !isEmpty(MODPATH_PREFIX) {
   MODPATH_PREFIX ~= s,[^/]+,..
-  #sprintf($$MODPATH_PREFIX%1
   SRCPATH = $$MODPATH_PREFIX/$$SRCPATH
 }
 
@@ -23,9 +22,9 @@ MODPATH = $$SRCPATH/$$MODULE  # Path to the module files
 
 # Define build directories
 
-OBJECTS_DIR = .$$MODNAME
-MOC_DIR =     .$$MODNAME
-UI_DIR =      .$$MODNAME
+OBJECTS_DIR = $$MODNAME
+MOC_DIR =     $$MODNAME
+UI_DIR =      $$MODNAME
 
 # Load module settings (files etc.)
 
@@ -38,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) {