| -rw-r--r-- | Makefile.Embedded | 10 | ||||
| -rw-r--r-- | kabc/kabc.pro | 2 | ||||
| -rw-r--r-- | kabc/kabcE.pro | 2 | ||||
| -rw-r--r-- | kaddressbook/kaddressbook.pro | 2 | ||||
| -rw-r--r-- | kmicromail/kmicromailE.pro | 2 | ||||
| -rw-r--r-- | korganizer/korganizer.pro | 2 | ||||
| -rw-r--r-- | korganizer/korganizerE.pro | 5 | ||||
| -rw-r--r-- | libkcal/libkcal.pro | 4 | ||||
| -rw-r--r-- | libkdepim/categoryeditdialog.h | 2 | ||||
| -rw-r--r-- | libkdepim/categoryselectdialog.cpp | 2 | ||||
| -rw-r--r-- | libkdepim/categoryselectdialog.h | 2 | ||||
| -rw-r--r-- | libkdepim/libkdepim.pro | 2 | ||||
| -rw-r--r-- | libkdepim/libkdepimE.pro | 3 | ||||
| -rw-r--r-- | microkde/microkde.pro | 5 | ||||
| -rw-r--r-- | microkde/microkdeE.pro | 2 |
15 files changed, 23 insertions, 24 deletions
diff --git a/Makefile.Embedded b/Makefile.Embedded index 38fd000..9b55ecf 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded @@ -1,4 +1,3 @@ -DISTPATH = $(shell pwd) -DISTDIR = $(shell basename $(DISTPATH)) +export KDEPIMDIR = $(shell pwd) @@ -111,4 +110,5 @@ variable_info: @echo -------------------------------------- @echo KDEPIM buildsystem, variableinfo... + @echo KDEPIMDIR=$(KDEPIMDIR) @echo QTDIR=$(QTDIR) @echo QPEDIR=$(QPEDIR) @@ -127,4 +127,8 @@ variable_info: variable_test: variable_info @echo KDEPIM buildsystem, variablecheck... + ifndef KDEPIMDIR + @echo KDEPIMDIR is not defined. + $(error KDEPIMDIR is not defined) + endif ifndef PLATFORM @echo PLATFORM is not defined. @@ -157,5 +161,5 @@ objects: clean: - rm -f libical/lib/$(PLATFORM)/*; + rm -rf libical/lib/$(PLATFORM)/*; for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ diff --git a/kabc/kabc.pro b/kabc/kabc.pro index 95ebd68..71087aa 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro @@ -8,5 +8,5 @@ TARGET = microkabc include( ../variables.pri ) -INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui .. +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 #LIBS += -lmicrokde -lldap diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro index 62a66eb..dfdbcff 100644 --- a/kabc/kabcE.pro +++ b/kabc/kabcE.pro @@ -4,5 +4,5 @@ TARGET = microkabc -INCLUDEPATH += . .. ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat $(QPEDIR)/include +INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index fec2341..7e9752d 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro @@ -7,5 +7,5 @@ include( ../variables.pri ) -INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces +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 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro index 962f788..c026808 100644 --- a/kmicromail/kmicromailE.pro +++ b/kmicromail/kmicromailE.pro @@ -51,5 +51,5 @@ INTERFACES = editaccountsui.ui \ -INCLUDEPATH += ../microkde ../microkde/kdecore ./libetpan/include $(QPEDIR)/include . .. ../microkde/kdeui ../qtcompat +INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim LIBS += $(QTOPIALIB) diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index e501d88..ca69e14 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro @@ -8,5 +8,5 @@ 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 diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index b39de35..16c27d1 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro @@ -6,6 +6,6 @@ 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 @@ -17,5 +17,4 @@ LIBS += -lmicrokde LIBS += -lmicroqtcompat LIBS += -lmicrokabc -#LIBS += -lmicrokabcwrap #LIBS += $(QPEDIR)/lib/gammu diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro index d02f080..95dd611 100644 --- a/libkcal/libkcal.pro +++ b/libkcal/libkcal.pro @@ -5,6 +5,6 @@ TARGET = microkcal include( ../variables.pri ) -INCLUDEPATH += ../microkde versit ../microkde/kdecore -#../qtcompat +INCLUDEPATH += $(KDEPIMDIR)/microkde versit $(KDEPIMDIR)/microkde/kdecore + INCLUDEPATH += ../libical/src/libical INCLUDEPATH += ../libical/src/libicalss diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h index 027cb98..4ebc802 100644 --- a/libkdepim/categoryeditdialog.h +++ b/libkdepim/categoryeditdialog.h @@ -24,5 +24,5 @@ #define KPIM_CATEGORYEDITDIALOG_H -#include <libkdepim/categoryeditdialog_base.h> +#include <categoryeditdialog_base.h> class KPimPrefs; diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp index 943d35c..40b46cf 100644 --- a/libkdepim/categoryselectdialog.cpp +++ b/libkdepim/categoryselectdialog.cpp @@ -29,5 +29,5 @@ -#include <libkdepim/categoryeditdialog.h> +#include "categoryeditdialog.h" #include "categoryselectdialog.h" diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h index 8507dc4..9b6261c 100644 --- a/libkdepim/categoryselectdialog.h +++ b/libkdepim/categoryselectdialog.h @@ -24,5 +24,5 @@ #define KPIM_CATEGORYSELECTDIALOG_H -#include <libkdepim/categoryselectdialog_base.h> +#include <categoryselectdialog_base.h> class KPimPrefs; diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index 060145e..d1d52a4 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro @@ -3,5 +3,5 @@ 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 diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro index 196044b..b455a3e 100644 --- a/libkdepim/libkdepimE.pro +++ b/libkdepim/libkdepimE.pro @@ -2,6 +2,5 @@ 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 diff --git a/microkde/microkde.pro b/microkde/microkde.pro index 71d662b..f132e9a 100644 --- a/microkde/microkde.pro +++ b/microkde/microkde.pro @@ -1,8 +1,5 @@ TEMPLATE = lib CONFIG += qt warn_on -#INCLUDEPATH += $(QTDIR)/include . -#DEPENDPATH += $(QTDIR)/include -INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio -#LIBS += -lqtcompat +INCLUDEPATH += . $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio TARGET = microkde diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro index fc80c03..df914ce 100644 --- a/microkde/microkdeE.pro +++ b/microkde/microkdeE.pro @@ -1,5 +1,5 @@ TEMPLATE = lib CONFIG += qt warn_on -INCLUDEPATH += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio $(QPEDIR)/include +INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include DEPENDPATH += $(QPEDIR)/include |