summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-08-12 17:09:11 (UTC)
committer ulf69 <ulf69>2004-08-12 17:09:11 (UTC)
commitafb21584fdb4dcc201fca13b4c5129fdf2e90154 (patch) (unidiff)
tree8db9ee9d00c8e1d432f3eed7c35be251932c4bd4
parent945f620dd57338d5b920f4ada3ff8e9e8d1cfe74 (diff)
downloadkdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.zip
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.gz
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.bz2
implemented new include strategy for makefiles
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile.Embedded10
-rw-r--r--kabc/kabc.pro2
-rw-r--r--kabc/kabcE.pro2
-rw-r--r--kaddressbook/kaddressbook.pro2
-rw-r--r--kmicromail/kmicromailE.pro2
-rw-r--r--korganizer/korganizer.pro2
-rw-r--r--korganizer/korganizerE.pro5
-rw-r--r--libkcal/libkcal.pro4
-rw-r--r--libkdepim/categoryeditdialog.h2
-rw-r--r--libkdepim/categoryselectdialog.cpp2
-rw-r--r--libkdepim/categoryselectdialog.h2
-rw-r--r--libkdepim/libkdepim.pro2
-rw-r--r--libkdepim/libkdepimE.pro3
-rw-r--r--microkde/microkde.pro5
-rw-r--r--microkde/microkdeE.pro2
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,5 +1,4 @@
1DISTPATH = $(shell pwd) 1export KDEPIMDIR = $(shell pwd)
2DISTDIR = $(shell basename $(DISTPATH))
3 2
4 3
5ifeq ($(PLATFORM) , zaurus) 4ifeq ($(PLATFORM) , zaurus)
@@ -110,6 +109,7 @@ build_micromail: build_microkde
110variable_info: 109variable_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)
115 @echo OPIEDIR=$(OPIEDIR) 115 @echo OPIEDIR=$(OPIEDIR)
@@ -126,6 +126,10 @@ variable_info:
126 126
127variable_test: variable_info 127variable_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.
131 $(error PLATFORM is not defined) 135 $(error PLATFORM is not defined)
@@ -156,7 +160,7 @@ objects:
156 mkdir -p libical/lib/$(PLATFORM) 160 mkdir -p libical/lib/$(PLATFORM)
157 161
158clean: 162clean:
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; \
162 done 166 done
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 95ebd68..71087aa 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -7,7 +7,7 @@ TARGET = microkabc
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui .. 10INCLUDEPATH += . 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
13LIBS += -L$(QPEDIR)/lib 13LIBS += -L$(QPEDIR)/lib
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 62a66eb..dfdbcff 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -3,7 +3,7 @@ CONFIG += qt warn_on
3TARGET = microkabc 3TARGET = microkabc
4 4
5 5
6INCLUDEPATH += . .. ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat $(QPEDIR)/include 6INCLUDEPATH += . $(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
7OBJECTS_DIR = obj/$(PLATFORM) 7OBJECTS_DIR = obj/$(PLATFORM)
8MOC_DIR = moc/$(PLATFORM) 8MOC_DIR = moc/$(PLATFORM)
9DESTDIR = $(QPEDIR)/lib 9DESTDIR = $(QPEDIR)/lib
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index fec2341..7e9752d 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -6,7 +6,7 @@ DESTDIR= ../bin
6include( ../variables.pri ) 6include( ../variables.pri )
7 7
8 8
9INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces 9INCLUDEPATH += . 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
10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION 10DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
11 11
12unix : { 12unix : {
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 962f788..c026808 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -50,7 +50,7 @@ INTERFACES = editaccountsui.ui \
50 nntpgroupsui.ui 50 nntpgroupsui.ui
51 51
52 52
53INCLUDEPATH += ../microkde ../microkde/kdecore ./libetpan/include $(QPEDIR)/include . .. ../microkde/kdeui ../qtcompat 53INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
54LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim 54LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim
55LIBS += $(QTOPIALIB) 55LIBS += $(QTOPIALIB)
56#LIBS += -lqtopia 56#LIBS += -lqtopia
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index e501d88..ca69e14 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -7,7 +7,7 @@ DESTDIR= ../bin
7 7
8include( ../variables.pri ) 8include( ../variables.pri )
9 9
10INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio 10INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde interfaces $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio
11#../qtcompat 11#../qtcompat
12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 12DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 13DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index b39de35..16c27d1 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -5,8 +5,8 @@ OBJECTS_DIR = obj/$(PLATFORM)
5MOC_DIR = moc/$(PLATFORM) 5MOC_DIR = moc/$(PLATFORM)
6DESTDIR=$(QPEDIR)/bin 6DESTDIR=$(QPEDIR)/bin
7 7
8INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces ../kabc $(QPEDIR)/include 8INCLUDEPATH += $(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
10DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL 10DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
11DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 11DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
12DEFINES += KORG_NOLVALTERNATION 12DEFINES += KORG_NOLVALTERNATION
@@ -16,7 +16,6 @@ LIBS += -lmicrokcal
16LIBS += -lmicrokde 16LIBS += -lmicrokde
17LIBS += -lmicroqtcompat 17LIBS += -lmicroqtcompat
18LIBS += -lmicrokabc 18LIBS += -lmicrokabc
19#LIBS += -lmicrokabcwrap
20 19
21#LIBS += $(QPEDIR)/lib/gammu 20#LIBS += $(QPEDIR)/lib/gammu
22LIBS += -lmicrogammu 21LIBS += -lmicrogammu
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index d02f080..95dd611 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -4,8 +4,8 @@ TARGET = microkcal
4 4
5include( ../variables.pri ) 5include( ../variables.pri )
6 6
7INCLUDEPATH += ../microkde versit ../microkde/kdecore 7INCLUDEPATH += $(KDEPIMDIR)/microkde versit $(KDEPIMDIR)/microkde/kdecore
8#../qtcompat 8
9INCLUDEPATH += ../libical/src/libical 9INCLUDEPATH += ../libical/src/libical
10INCLUDEPATH += ../libical/src/libicalss 10INCLUDEPATH += ../libical/src/libicalss
11DESTDIR = ../bin 11DESTDIR = ../bin
diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index 027cb98..4ebc802 100644
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@@ -23,7 +23,7 @@
23#ifndef KPIM_CATEGORYEDITDIALOG_H 23#ifndef KPIM_CATEGORYEDITDIALOG_H
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
28class KPimPrefs; 28class KPimPrefs;
29 29
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 943d35c..40b46cf 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -28,7 +28,7 @@
28#include <qmessagebox.h> 28#include <qmessagebox.h>
29 29
30 30
31#include <libkdepim/categoryeditdialog.h> 31#include "categoryeditdialog.h"
32#include "categoryselectdialog.h" 32#include "categoryselectdialog.h"
33 33
34#include "kpimprefs.h" 34#include "kpimprefs.h"
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index 8507dc4..9b6261c 100644
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@@ -23,7 +23,7 @@
23#ifndef KPIM_CATEGORYSELECTDIALOG_H 23#ifndef KPIM_CATEGORYSELECTDIALOG_H
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
28class KPimPrefs; 28class KPimPrefs;
29 29
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 060145e..d1d52a4 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3DEFINES +=KORG_NOKABC 3DEFINES +=KORG_NOKABC
4TARGET = microkdepim 4TARGET = microkdepim
5INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. 5INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui
6DESTDIR=../bin 6DESTDIR=../bin
7 7
8DEFINES += DESKTOP_VERSION 8DEFINES += DESKTOP_VERSION
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index 196044b..b455a3e 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -1,8 +1,7 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3TARGET = microkdepim 3TARGET = microkdepim
4INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include 4INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
5INCLUDEPATH += . ..
6LIBS += -lmicrokde 5LIBS += -lmicrokde
7LIBS += -lmicrokcal 6LIBS += -lmicrokcal
8LIBS += -L$(QPEDIR)/lib 7LIBS += -L$(QPEDIR)/lib
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 71d662b..f132e9a 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -1,9 +1,6 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3#INCLUDEPATH += $(QTDIR)/include . 3INCLUDEPATH += . $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio
4#DEPENDPATH += $(QTDIR)/include
5INCLUDEPATH += . ../ ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
6#LIBS += -lqtcompat
7 4
8 TARGET = microkde 5 TARGET = microkde
9DESTDIR= ../bin 6DESTDIR= ../bin
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index fc80c03..df914ce 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -1,6 +1,6 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3INCLUDEPATH += . ../qtcompat ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio $(QPEDIR)/include 3INCLUDEPATH += . $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui kio/kfile kio/kio $(QPEDIR)/include
4 4
5DEPENDPATH += $(QPEDIR)/include 5DEPENDPATH += $(QPEDIR)/include
6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib 6LIBS += -lmicroqtcompat -L$(QPEDIR)/lib