X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=build%2Fmodules%2Fmodule.pri;h=6dc018d360836acc63088374063a6d2f300e4d40;hp=6be89a87cf0af571f8dba1198b35b91e3b2f417f;hb=0b25f3d02a72ebe2953441f36fd6595bb9fb4e22;hpb=2eea4f7ac38f9c36a923d1ad3108aa1cd48f9749

diff --git a/build/modules/module.pri b/build/modules/module.pri
index 6be89a87..6dc018d3 100644
--- a/build/modules/module.pri
+++ b/build/modules/module.pri
@@ -1,6 +1,8 @@
 # module.pri
 # This file is included by module project files.
 
+include(../buildconf.pri)
+
 TEMPLATE = lib
 CONFIG += staticlib
 
@@ -13,7 +15,6 @@ MODNAME = $$basename(MODULE)
 MODPATH_PREFIX = $$dirname(MODULE)
 !isEmpty(MODPATH_PREFIX) {
   MODPATH_PREFIX ~= s,[^/]+,..
-  #sprintf($$MODPATH_PREFIX%1
   SRCPATH = $$MODPATH_PREFIX/$$SRCPATH
 }
 
@@ -21,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.)
 
@@ -36,12 +37,16 @@ for(qtmod, QT_MOD) {
   QT *= $$qtmod
 }
 
+# Include contrib stuff
+
+include(../contrib/contrib.pri)
+
 # Set includepath for needed Quassel modules
 
 for(dep, DEPMOD) {
   INCLUDEPATH *= $$SRCPATH/$$dep
 }
-INCLUDEPATH *= $$MODPATH  # and don't forget our own dir
+INCLUDEPATH *= $$MODPATH ../../  # and don't forget our own dir
 
 # Now prefix all filenames with the correct dirname