-Use the global directory for .obj and .moc

-Include the foo.moc to work better

The problem just came up yesterday

4 files changed, 1 insertions, 7 deletions

diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
index 6712870..2ee4a65 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.cpp
@@ -30,4 +30,3 @@ int main( int argc, char** argv )
 
 }
 
-//#include "moc/oconfigdemo.moc"
diff --git a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
index 9721e99..b29c106 100644
--- a/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
+++ b/libopie2/examples/opiecore/oconfigdemo/oconfigdemo.pro
@@ -7,8 +7,6 @@ INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2
 TARGET          = oconfigdemo
-MOC_DIR     = moc
-OBJECTS_DIR = obj
 
 !contains( platform, x11 ) {
   include( $(OPIEDIR)/include.pro )
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
index c0369ef..b046d28 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp
@@ -139,4 +139,4 @@ int main( int argc, char** argv )
 
 }
 
-#include "moc/odebugdemo.moc"
+#include "odebugdemo.moc"
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
index 781d678..e06053c 100644
--- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
+++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.pro
@@ -7,8 +7,6 @@ DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lopiecore2
 TARGET          = odebugdemo
 
-OBJECTS_DIR = obj
-
 !contains( platform, x11 ) {
   include( $(OPIEDIR)/include.pro )
 }
@@ -17,4 +15,3 @@ contains( platform, x11 ) {
   LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }
 
-MOC_DIR = moc