changes in makefiles to implement better inclusionpatterns

author: ulf69 <ulf69> 2004-08-12 18:11:32 (UTC)
committer: ulf69 <ulf69> 2004-08-12 18:11:32 (UTC)
commit: cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec (patch) (unidiff)
tree: 87918afe0ca3e06f4b8d892fbf32dc62edec125f
parent: afb21584fdb4dcc201fca13b4c5129fdf2e90154 (diff)
download: kdepimpi-cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec.zip
kdepimpi-cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec.tar.gz
kdepimpi-cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec.tar.bz2
8 files changed, 9 insertions, 9 deletions
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index a7c1503..1f25fd7 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -1,13 +1,13 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 TARGET = microkabc_dir
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
-DESTDIR = ../../../bin
+DESTDIR = $(KDEPIMDIR)/bin
 #LIBS += -lmicrokde -lmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 INTERFACES = \
 HEADERS = \
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index 9066556..cda4e2f 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 TARGET = microkabc_dir
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 154ef2a..7044de5 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 TARGET = microkabc_file
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile  $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 DESTDIR = ../../../bin
 #LIBS += -lmicrokde -lmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 INTERFACES = \
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 3015806..16707e5 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 TARGET = microkabc_file
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro
index 2e79fc0..57b6f84 100644
--- a/kabc/plugins/ldap/ldapE.pro
+++ b/kabc/plugins/ldap/ldapE.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 TARGET = microkabc_ldap
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index 912e596..b7ecbc0 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
 CONFIG += qt warn_on
 #release debug
 TARGET = microkabc_opie
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include $(OPIEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index d956519..148da2a 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,12 +1,12 @@
        TEMPLATE= lib
 CONFIG += qt warn_on
 TARGET = microkabc_qtopia
-INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 52bc10f..a49fddf 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,11 +1,11 @@
        TEMPLATE= lib
 CONFIG += qt warn_on
 TARGET = microkabc_sharpdtm
-INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include 
+INCLUDEPATH += $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde
author	ulf69 <ulf69>	2004-08-12 18:11:32 (UTC)
committer	ulf69 <ulf69>	2004-08-12 18:11:32 (UTC)
commit	cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec (patch) (unidiff)
tree	87918afe0ca3e06f4b8d892fbf32dc62edec125f
parent	afb21584fdb4dcc201fca13b4c5129fdf2e90154 (diff)
download	kdepimpi-cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec.zip kdepimpi-cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec.tar.gz kdepimpi-cce21bef81e7ebcaa4ff9d91338a9b289c1c6cec.tar.bz2

diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro index a7c1503..1f25fd7 100644 --- a/kabc/plugins/dir/dir.pro +++ b/kabc/plugins/dir/dir.pro
@@ -1,13 +1,13 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	#release debug	3	#release debug
4		4
5	TARGET = microkabc_dir	5	TARGET = microkabc_dir
6	INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat	6	INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
7	DESTDIR = ../../../bin	7	DESTDIR = $(KDEPIMDIR)/bin
8	#LIBS += -lmicrokde -lmicrokabc	8	#LIBS += -lmicrokde -lmicrokabc
9	#LIBS += -L$(QPEDIR)/lib	9	#LIBS += -L$(QPEDIR)/lib
10		10
11	INTERFACES = \	11	INTERFACES = \
12		12
13	HEADERS = \	13	HEADERS = \


diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro index 9066556..cda4e2f 100644 --- a/kabc/plugins/dir/dirE.pro +++ b/kabc/plugins/dir/dirE.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	#release debug	3	#release debug
4		4
5	TARGET = microkabc_dir	5	TARGET = microkabc_dir
6	INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat	6	INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
7	OBJECTS_DIR = obj/$(PLATFORM)	7	OBJECTS_DIR = obj/$(PLATFORM)
8	MOC_DIR = moc/$(PLATFORM)	8	MOC_DIR = moc/$(PLATFORM)
9	DESTDIR = $(QPEDIR)/lib	9	DESTDIR = $(QPEDIR)/lib
10	LIBS += -lmicrokde -lmicrokabc	10	LIBS += -lmicrokde -lmicrokabc
11	LIBS += -L$(QPEDIR)/lib	11	LIBS += -L$(QPEDIR)/lib
12		12


diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro index 154ef2a..7044de5 100644 --- a/kabc/plugins/file/file.pro +++ b/kabc/plugins/file/file.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	#release debug	3	#release debug
4		4
5	TARGET = microkabc_file	5	TARGET = microkabc_file
6	INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat	6	INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
7		7
8	DESTDIR = ../../../bin	8	DESTDIR = ../../../bin
9	#LIBS += -lmicrokde -lmicrokabc	9	#LIBS += -lmicrokde -lmicrokabc
10	#LIBS += -L$(QPEDIR)/lib	10	#LIBS += -L$(QPEDIR)/lib
11		11
12	INTERFACES = \	12	INTERFACES = \


diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro index 3015806..16707e5 100644 --- a/kabc/plugins/file/fileE.pro +++ b/kabc/plugins/file/fileE.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	#release debug	3	#release debug
4		4
5	TARGET = microkabc_file	5	TARGET = microkabc_file
6	INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat	6	INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
7	OBJECTS_DIR = obj/$(PLATFORM)	7	OBJECTS_DIR = obj/$(PLATFORM)
8	MOC_DIR = moc/$(PLATFORM)	8	MOC_DIR = moc/$(PLATFORM)
9	DESTDIR = $(QPEDIR)/lib	9	DESTDIR = $(QPEDIR)/lib
10	LIBS += -lmicrokde -lmicrokabc	10	LIBS += -lmicrokde -lmicrokabc
11	LIBS += -L$(QPEDIR)/lib	11	LIBS += -L$(QPEDIR)/lib
12		12


diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro index 2e79fc0..57b6f84 100644 --- a/kabc/plugins/ldap/ldapE.pro +++ b/kabc/plugins/ldap/ldapE.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on release	2	CONFIG += qt warn_on release
3	#release debug	3	#release debug
4		4
5	TARGET = microkabc_ldap	5	TARGET = microkabc_ldap
6	INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include	6	INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
7	OBJECTS_DIR = obj/$(PLATFORM)	7	OBJECTS_DIR = obj/$(PLATFORM)
8	MOC_DIR = moc/$(PLATFORM)	8	MOC_DIR = moc/$(PLATFORM)
9	DESTDIR = $(QPEDIR)/lib	9	DESTDIR = $(QPEDIR)/lib
10	LIBS += -lmicrokde -lmicrokabc	10	LIBS += -lmicrokde -lmicrokabc
11	LIBS += -L$(QPEDIR)/lib	11	LIBS += -L$(QPEDIR)/lib
12		12


diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro index 912e596..b7ecbc0 100644 --- a/kabc/plugins/opie/opieE.pro +++ b/kabc/plugins/opie/opieE.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on	2	CONFIG += qt warn_on
3	#release debug	3	#release debug
4	TARGET = microkabc_opie	4	TARGET = microkabc_opie
5		5
6	INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include $(OPIEDIR)/include	6	INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include $(OPIEDIR)/include
7		7
8		8
9	OBJECTS_DIR = obj/$(PLATFORM)	9	OBJECTS_DIR = obj/$(PLATFORM)
10	MOC_DIR = moc/$(PLATFORM)	10	MOC_DIR = moc/$(PLATFORM)
11	DESTDIR = $(QPEDIR)/lib	11	DESTDIR = $(QPEDIR)/lib
12	LIBS += -lmicrokde	12	LIBS += -lmicrokde


diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro index d956519..148da2a 100644 --- a/kabc/plugins/qtopia/qtopiaE.pro +++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,12 +1,12 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on	2	CONFIG += qt warn_on
3		3
4	TARGET = microkabc_qtopia	4	TARGET = microkabc_qtopia
5		5
6	INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include	6	INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
7		7
8	OBJECTS_DIR = obj/$(PLATFORM)	8	OBJECTS_DIR = obj/$(PLATFORM)
9	MOC_DIR = moc/$(PLATFORM)	9	MOC_DIR = moc/$(PLATFORM)
10	DESTDIR = $(QPEDIR)/lib	10	DESTDIR = $(QPEDIR)/lib
11	LIBS += -lmicrokde	11	LIBS += -lmicrokde
12	LIBS += -lmicrokabc	12	LIBS += -lmicrokabc


diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro index 52bc10f..a49fddf 100644 --- a/kabc/plugins/sharpdtm/sharpdtmE.pro +++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,11 +1,11 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on	2	CONFIG += qt warn_on
3	TARGET = microkabc_sharpdtm	3	TARGET = microkabc_sharpdtm
4		4
5	INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include	5	INCLUDEPATH += $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
6		6
7		7
8	OBJECTS_DIR = obj/$(PLATFORM)	8	OBJECTS_DIR = obj/$(PLATFORM)
9	MOC_DIR = moc/$(PLATFORM)	9	MOC_DIR = moc/$(PLATFORM)
10	DESTDIR = $(QPEDIR)/lib	10	DESTDIR = $(QPEDIR)/lib
11	LIBS += -lmicrokde	11	LIBS += -lmicrokde