undo includepath changes

6 files changed, 10 insertions, 7 deletions

diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 71087aa..95ebd68 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -1,22 +1,22 @@
         TEMPLATE= lib
 CONFIG += qt warn_on 
 #release debug
 DESTDIR=../bin
 
 TARGET = microkabc
 
 include( ../variables.pri )
 
-INCLUDEPATH += . vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdeui 
+INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui ..
 
 #LIBS += -lmicrokde -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 unix : {
 
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index 7e9752d..fec2341 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,21 +1,21 @@
         TEMPLATE= app
         CONFIG  = qt warn_on 
         TARGET  = kapi
 DESTDIR= ../bin
 
 include( ../variables.pri )
 
 
-INCLUDEPATH += . details features xxport $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kutils $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/kabc $(KDEPIMDIR) interfaces 
+INCLUDEPATH += . ./details  ./features  ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc  ../ interfaces 
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
 
 unix : {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 LIBS += ../bin/libmicrokcal.so
 LIBS += ../bin/libmicrogammu.so
 LIBS += -lbluetooth
 LIBS += -lsdp
 LIBS += -lldap
 OBJECTS_DIR = obj/unix
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index ca69e14..e501d88 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,22 +1,22 @@
         TEMPLATE= app
         CONFIG  = qt warn_on 
         TARGET  = kopi
 OBJECTS_DIR = _obj/
 MOC_DIR = _moc
 DESTDIR= ../bin
 
 include( ../variables.pri )
 
-INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde  interfaces $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio
+INCLUDEPATH += ../microkde  ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio
 #../qtcompat
 DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #KORG_NOPRINTER KORG_NOKABC 
 DEFINES += KORG_NOLVALTERNATION
 DEFINES +=  DESKTOP_VERSION
 unix : {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokcal.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 LIBS += ../bin/libmicrogammu.so
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index 95dd611..d02f080 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -1,20 +1,20 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on
         TARGET  = microkcal
 
 include( ../variables.pri )
 
-INCLUDEPATH += $(KDEPIMDIR)/microkde  versit $(KDEPIMDIR)/microkde/kdecore
-
+INCLUDEPATH += ../microkde  versit ../microkde/kdecore
+#../qtcompat
 INCLUDEPATH += ../libical/src/libical
 INCLUDEPATH += ../libical/src/libicalss
 DESTDIR = ../bin
 DEFINES +=  DESKTOP_VERSION
 unix: {
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index d1d52a4..060145e 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -1,17 +1,17 @@
         TEMPLATE= lib
         CONFIG  = qt warn_on
 DEFINES +=KORG_NOKABC
 TARGET = microkdepim
-INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui 
+INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . ..
 DESTDIR=../bin
 
 DEFINES +=  DESKTOP_VERSION
 include( ../variables.pri )
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index f132e9a..71d662b 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,15 +1,18 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on 
-INCLUDEPATH     += .  $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio
+#INCLUDEPATH     += $(QTDIR)/include .
+#DEPENDPATH      += $(QTDIR)/include
+INCLUDEPATH     += .  ../  ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
+#LIBS            += -lqtcompat
 
         TARGET  = microkde
 DESTDIR= ../bin
 DEFINES += DESKTOP_VERSION KDE_QT_ONLY
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win