-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 @@ | |||
1 | DISTPATH = $(shell pwd) | 1 | export KDEPIMDIR = $(shell pwd) |
2 | DISTDIR = $(shell basename $(DISTPATH)) | ||
3 | 2 | ||
4 | 3 | ||
@@ -111,4 +110,5 @@ variable_info: | |||
111 | @echo -------------------------------------- | 110 | @echo -------------------------------------- |
112 | @echo KDEPIM buildsystem, variableinfo... | 111 | @echo KDEPIM buildsystem, variableinfo... |
112 | @echo KDEPIMDIR=$(KDEPIMDIR) | ||
113 | @echo QTDIR=$(QTDIR) | 113 | @echo QTDIR=$(QTDIR) |
114 | @echo QPEDIR=$(QPEDIR) | 114 | @echo QPEDIR=$(QPEDIR) |
@@ -127,4 +127,8 @@ variable_info: | |||
127 | variable_test: variable_info | 127 | variable_test: variable_info |
128 | @echo KDEPIM buildsystem, variablecheck... | 128 | @echo KDEPIM buildsystem, variablecheck... |
129 | ifndef KDEPIMDIR | ||
130 | @echo KDEPIMDIR is not defined. | ||
131 | $(error KDEPIMDIR is not defined) | ||
132 | endif | ||
129 | ifndef PLATFORM | 133 | ifndef PLATFORM |
130 | @echo PLATFORM is not defined. | 134 | @echo PLATFORM is not defined. |
@@ -157,5 +161,5 @@ objects: | |||
157 | 161 | ||
158 | clean: | 162 | clean: |
159 | rm -f libical/lib/$(PLATFORM)/*; | 163 | rm -rf libical/lib/$(PLATFORM)/*; |
160 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 164 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ |
161 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 165 | 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 | |||
8 | include( ../variables.pri ) | 8 | include( ../variables.pri ) |
9 | 9 | ||
10 | INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui .. | 10 | 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 |
11 | 11 | ||
12 | #LIBS += -lmicrokde -lldap | 12 | #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 | |||
4 | 4 | ||
5 | 5 | ||
6 | INCLUDEPATH += . .. ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat $(QPEDIR)/include | 6 | 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 |
7 | OBJECTS_DIR = obj/$(PLATFORM) | 7 | OBJECTS_DIR = obj/$(PLATFORM) |
8 | MOC_DIR = moc/$(PLATFORM) | 8 | 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 ) | |||
7 | 7 | ||
8 | 8 | ||
9 | INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces | 9 | 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 |
10 | DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION | 10 | DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION |
11 | 11 | ||
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 \ | |||
51 | 51 | ||
52 | 52 | ||
53 | INCLUDEPATH += ../microkde ../microkde/kdecore ./libetpan/include $(QPEDIR)/include . .. ../microkde/kdeui ../qtcompat | 53 | INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include |
54 | LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim | 54 | LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim |
55 | LIBS += $(QTOPIALIB) | 55 | 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 | |||
8 | include( ../variables.pri ) | 8 | include( ../variables.pri ) |
9 | 9 | ||
10 | INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio | 10 | INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde interfaces $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio |
11 | #../qtcompat | 11 | #../qtcompat |
12 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | 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) | |||
6 | DESTDIR=$(QPEDIR)/bin | 6 | DESTDIR=$(QPEDIR)/bin |
7 | 7 | ||
8 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include | 8 | 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 |
9 | #../libkabcwrap | 9 | |
10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 10 | DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 11 | DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
@@ -17,5 +17,4 @@ LIBS += -lmicrokde | |||
17 | LIBS += -lmicroqtcompat | 17 | LIBS += -lmicroqtcompat |
18 | LIBS += -lmicrokabc | 18 | LIBS += -lmicrokabc |
19 | #LIBS += -lmicrokabcwrap | ||
20 | 19 | ||
21 | #LIBS += $(QPEDIR)/lib/gammu | 20 | #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 | |||
5 | include( ../variables.pri ) | 5 | include( ../variables.pri ) |
6 | 6 | ||
7 | INCLUDEPATH += ../microkde versit ../microkde/kdecore | 7 | INCLUDEPATH += $(KDEPIMDIR)/microkde versit $(KDEPIMDIR)/microkde/kdecore |
8 | #../qtcompat | 8 | |
9 | INCLUDEPATH += ../libical/src/libical | 9 | INCLUDEPATH += ../libical/src/libical |
10 | INCLUDEPATH += ../libical/src/libicalss | 10 | 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 @@ | |||
24 | #define KPIM_CATEGORYEDITDIALOG_H | 24 | #define KPIM_CATEGORYEDITDIALOG_H |
25 | 25 | ||
26 | #include <libkdepim/categoryeditdialog_base.h> | 26 | #include <categoryeditdialog_base.h> |
27 | 27 | ||
28 | class KPimPrefs; | 28 | 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 @@ | |||
29 | 29 | ||
30 | 30 | ||
31 | #include <libkdepim/categoryeditdialog.h> | 31 | #include "categoryeditdialog.h" |
32 | #include "categoryselectdialog.h" | 32 | #include "categoryselectdialog.h" |
33 | 33 | ||
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 @@ | |||
24 | #define KPIM_CATEGORYSELECTDIALOG_H | 24 | #define KPIM_CATEGORYSELECTDIALOG_H |
25 | 25 | ||
26 | #include <libkdepim/categoryselectdialog_base.h> | 26 | #include <categoryselectdialog_base.h> |
27 | 27 | ||
28 | class KPimPrefs; | 28 | 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 | |||
3 | DEFINES +=KORG_NOKABC | 3 | DEFINES +=KORG_NOKABC |
4 | TARGET = microkdepim | 4 | TARGET = microkdepim |
5 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. | 5 | INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui |
6 | DESTDIR=../bin | 6 | DESTDIR=../bin |
7 | 7 | ||
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 | |||
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | TARGET = microkdepim | 3 | TARGET = microkdepim |
4 | INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include | 4 | INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include |
5 | INCLUDEPATH += . .. | ||
6 | LIBS += -lmicrokde | 5 | LIBS += -lmicrokde |
7 | LIBS += -lmicrokcal | 6 | 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 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | #INCLUDEPATH += $(QTDIR)/include . | 3 | INCLUDEPATH += . $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio |
4 | #DEPENDPATH += $(QTDIR)/include | ||
5 | INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio | ||
6 | #LIBS += -lqtcompat | ||
7 | 4 | ||
8 | TARGET = microkde | 5 | 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 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | INCLUDEPATH += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio $(QPEDIR)/include | 3 | INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include |
4 | 4 | ||
5 | DEPENDPATH += $(QPEDIR)/include | 5 | DEPENDPATH += $(QPEDIR)/include |