implemented new include strategy for makefiles

2 files changed, 3 insertions, 4 deletions

diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index e501d88..ca69e14 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,106 +1,106 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on 
 TARGET		= kopi
 OBJECTS_DIR = _obj/
 MOC_DIR = _moc
 DESTDIR= ../bin
 
 include( ../variables.pri )
 
-INCLUDEPATH += ../microkde  ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio
+INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde  interfaces $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/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
 LIBS += -lbluetooth
 LIBS += -lsdp
 
 LIBS += -lldap
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_  
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 LIBS += mfc71u.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 #QMAKE_LINK += /NODEFAULTLIB:MSVCRT
 #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 
  
 INTERFACES = kofilterview_base.ui
 #  filteredit_base.ui
 
 # kdateedit.h \
 
 HEADERS = \
  filteredit_base.h \
  alarmclient.h \
  calendarview.h \
  customlistviewitem.h \
  datenavigator.h \
  docprefs.h \
  filtereditdialog.h \
  incomingdialog.h \
  incomingdialog_base.h \
  interfaces/korganizer/baseview.h \
  interfaces/korganizer/calendarviewbase.h \
  journalentry.h \
  kdatenavigator.h \
  koagenda.h \
  koagendaitem.h \
  koagendaview.h \
  kocounterdialog.h \
  kodaymatrix.h \
  kodialogmanager.h \
  koeditordetails.h \
  koeditorgeneral.h \
  koeditorgeneralevent.h \
  koeditorgeneraltodo.h \
  koeditorrecurrence.h \
  koeventeditor.h \
  koeventpopupmenu.h \
  koeventview.h \
  koeventviewer.h \
  koeventviewerdialog.h \
  kofilterview.h \
  koglobals.h \
  koincidenceeditor.h \
  kojournalview.h \
  kolistview.h \
  kolocationbox.h \
  komonthview.h \
  koprefs.h \
  koprefsdialog.h \
  kotimespanview.h \
  kotodoeditor.h \
  kotodoview.h \
  kotodoviewitem.h \
  koviewmanager.h \
  kowhatsnextview.h \
  ktimeedit.h \
  lineview.h \
  mainwindow.h \
  navigatorbar.h \
  outgoingdialog.h \
  outgoingdialog_base.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index b39de35..16c27d1 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -1,115 +1,114 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on
 TARGET		= kopi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
-INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces  ../kabc $(QPEDIR)/include
-#../libkabcwrap
+INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include
+
 DEFINES += KORG_NODND KORG_NOPLUGINS  KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 DEFINES += KORG_NOLVALTERNATION
 #KORG_NOKABC
 LIBS += -lmicrokdepim
 LIBS += -lmicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
 LIBS += -lmicrokabc
-#LIBS += -lmicrokabcwrap
 
 #LIBS +=  $(QPEDIR)/lib/gammu
 LIBS += -lmicrogammu
 LIBS += -lbluetooth
 LIBS += -lsdp
 
 
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
  
 INTERFACES =  kofilterview_base.ui 
 #filteredit_base.ui
 
 HEADERS = \
  wordsgerman.h \
  filteredit_base.h \
  alarmclient.h \
  calendarview.h \
  customlistviewitem.h \
  datenavigator.h \
  docprefs.h \
  filtereditdialog.h \
  incomingdialog.h \
  incomingdialog_base.h \
  interfaces/korganizer/baseview.h \
  interfaces/korganizer/calendarviewbase.h \
  journalentry.h \
  kdateedit.h \
  kdatenavigator.h \
  koagenda.h \
  koagendaitem.h \
  koagendaview.h \
  kocounterdialog.h \
  kodaymatrix.h \
  kodialogmanager.h \
  koeditordetails.h \
  koeditorgeneral.h \
  koeditorgeneralevent.h \
  koeditorgeneraltodo.h \
  koeditorrecurrence.h \
  koeventeditor.h \
  koeventpopupmenu.h \
  koeventview.h \
  koeventviewer.h \
  koeventviewerdialog.h \
  kofilterview.h \
  koglobals.h \
  koincidenceeditor.h \
  kojournalview.h \
  kolistview.h \
  kolocationbox.h \
  komonthview.h \
  koprefs.h \
  koprefsdialog.h \
  kotimespanview.h \
  kotodoeditor.h \
  kotodoview.h \
  kotodoviewitem.h \
  koviewmanager.h \
  kowhatsnextview.h \
  ktimeedit.h \
  lineview.h \
  mainwindow.h \
  navigatorbar.h \
  outgoingdialog.h \
  outgoingdialog_base.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
  searchdialog.h \
  simplealarmclient.h \
  statusdialog.h \
  timeline.h \
  timespanview.h \
  version.h \
  ../kalarmd/alarmdialog.h
 
 SOURCES = \
  filteredit_base.cpp \
  calendarview.cpp \
  datenavigator.cpp \
  docprefs.cpp \
  filtereditdialog.cpp \
  incomingdialog.cpp \
  incomingdialog_base.cpp \
  journalentry.cpp \
  kdatenavigator.cpp \
  koagenda.cpp \
  koagendaitem.cpp \
  koagendaview.cpp \
  kocounterdialog.cpp \
  kodaymatrix.cpp \
  kodialogmanager.cpp \
  koeditordetails.cpp \