implemented new include strategy for makefiles

5 files changed, 5 insertions, 6 deletions

diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index 027cb98..4ebc802 100644
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@@ -20,13 +20,13 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KPIM_CATEGORYEDITDIALOG_H
 #define KPIM_CATEGORYEDITDIALOG_H
 
-#include <libkdepim/categoryeditdialog_base.h>
+#include <categoryeditdialog_base.h>
 
 class KPimPrefs;
 
 namespace KPIM {
 
 class CategoryEditDialog : public CategoryEditDialog_base
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 943d35c..40b46cf 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -25,13 +25,13 @@
 #include <qpushbutton.h>
 #include <qheader.h>
 #include <qapp.h>
 #include <qmessagebox.h>
 
 
-#include <libkdepim/categoryeditdialog.h>
+#include "categoryeditdialog.h"
 #include "categoryselectdialog.h"
 
 #include "kpimprefs.h"
 
 using namespace KPIM;
 
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index 8507dc4..9b6261c 100644
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@@ -20,13 +20,13 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KPIM_CATEGORYSELECTDIALOG_H
 #define KPIM_CATEGORYSELECTDIALOG_H
 
-#include <libkdepim/categoryselectdialog_base.h>
+#include <categoryselectdialog_base.h>
 
 class KPimPrefs;
 
 namespace KPIM {
 
 class CategorySelectDialog : public CategorySelectDialog_base
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 060145e..d1d52a4 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -1,11 +1,11 @@
         TEMPLATE= lib
         CONFIG  = qt warn_on
 DEFINES +=KORG_NOKABC
 TARGET = microkdepim
-INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . ..
+INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui 
 DESTDIR=../bin
 
 DEFINES +=  DESKTOP_VERSION
 include( ../variables.pri )
 unix : {
 OBJECTS_DIR = obj/unix
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index 196044b..b455a3e 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -1,11 +1,10 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on
 TARGET = microkdepim
-INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include
-INCLUDEPATH += . ..
+INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
 LIBS += -lmicrokde
 LIBS += -lmicrokcal
 LIBS += -L$(QPEDIR)/lib
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib