implemented new include strategy for makefiles

author: ulf69 <ulf69> 2004-08-12 17:09:11 (UTC)
committer: ulf69 <ulf69> 2004-08-12 17:09:11 (UTC)
commit: afb21584fdb4dcc201fca13b4c5129fdf2e90154 (patch) (unidiff)
tree: 8db9ee9d00c8e1d432f3eed7c35be251932c4bd4 /kabc
parent: 945f620dd57338d5b920f4ada3ff8e9e8d1cfe74 (diff)
download: kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.zip
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.gz
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.bz2
2 files changed, 2 insertions, 2 deletions
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 95ebd68..71087aa 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -1,58 +1,58 @@
        TEMPLATE= lib
 CONFIG += qt warn_on 
 #release debug
 DESTDIR=../bin
 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
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 INTERFACES = \
 HEADERS = \
 resource.h \
 stdaddressbook.h \
 agent.h \
 geo.h \
 key.h \
 field.h \
 plugin.h \
 address.h \
 addresseelist.h \
 formatfactory.h \
 formatplugin.h \
 phonenumber.h \
 distributionlist.h \
 distributionlistdialog.h \
 distributionlisteditor.h \
 vcardformatplugin.h \
 formats/vcardformatplugin2.h \
 picture.h \
 secrecy.h \
 sound.h \
 addressbook.h \
 syncprefwidget.h \
 timezone.h \
 tmpaddressbook.h \
 addressee.h \
 addresseedialog.h \
 vcardconverter.h \
 vcard21parser.h \
 vcardformatimpl.h \
 plugins/file/resourcefile.h \
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 62a66eb..dfdbcff 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,54 +1,54 @@
        TEMPLATE= lib
 CONFIG += qt warn_on 
 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)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokdepim 
 #LIBS += -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 INTERFACES = \
 HEADERS = \
 address.h \
 addressbook.h \
 addressee.h \
 addresseedialog.h \
 addresseelist.h \
 agent.h \
 distributionlist.h \
 distributionlistdialog.h \
 distributionlisteditor.h \
 field.h \
 formatfactory.h \
 formatplugin.h \
 geo.h \
 key.h \
 phonenumber.h \
 picture.h \
 plugin.h \
 resource.h \
 secrecy.h \
 sound.h \
 stdaddressbook.h \
 syncprefwidget.h \
 timezone.h \
 tmpaddressbook.h \
 vcardconverter.h \
 vcard21parser.h \
 vcardformatimpl.h \
 vcardformatplugin.h \
 vcardparser/vcardline.h \
 vcardparser/vcard.h \
 vcardparser/vcardtool.h \
 vcardparser/vcardparser.h \
 vcard/include/VCardAdrParam.h \
 vcard/include/VCardAdrValue.h \
 vcard/include/VCardAgentParam.h \
 vcard/include/VCardContentLine.h \
author	ulf69 <ulf69>	2004-08-12 17:09:11 (UTC)
committer	ulf69 <ulf69>	2004-08-12 17:09:11 (UTC)
commit	afb21584fdb4dcc201fca13b4c5129fdf2e90154 (patch) (unidiff)
tree	8db9ee9d00c8e1d432f3eed7c35be251932c4bd4 /kabc
parent	945f620dd57338d5b920f4ada3ff8e9e8d1cfe74 (diff)
download	kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.zip kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.gz kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.bz2

diff --git a/kabc/kabc.pro b/kabc/kabc.pro index 95ebd68..71087aa 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro
@@ -1,58 +1,58 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on	2	CONFIG += qt warn_on
3	#release debug	3	#release debug
4	DESTDIR=../bin	4	DESTDIR=../bin
5		5
6	TARGET = microkabc	6	TARGET = microkabc
7		7
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
13	LIBS += -L$(QPEDIR)/lib	13	LIBS += -L$(QPEDIR)/lib
14	DEFINES += KAB_EMBEDDED DESKTOP_VERSION	14	DEFINES += KAB_EMBEDDED DESKTOP_VERSION
15	unix : {	15	unix : {
16		16
17	OBJECTS_DIR = obj/unix	17	OBJECTS_DIR = obj/unix
18	MOC_DIR = moc/unix	18	MOC_DIR = moc/unix
19	}	19	}
20	win32: {	20	win32: {
21	DEFINES += _WIN32_	21	DEFINES += _WIN32_
22	OBJECTS_DIR = obj/win	22	OBJECTS_DIR = obj/win
23	MOC_DIR = moc/win	23	MOC_DIR = moc/win
24	}	24	}
25	INTERFACES = \	25	INTERFACES = \
26		26
27		27
28	HEADERS = \	28	HEADERS = \
29	resource.h \	29	resource.h \
30	stdaddressbook.h \	30	stdaddressbook.h \
31	agent.h \	31	agent.h \
32	geo.h \	32	geo.h \
33	key.h \	33	key.h \
34	field.h \	34	field.h \
35	plugin.h \	35	plugin.h \
36	address.h \	36	address.h \
37	addresseelist.h \	37	addresseelist.h \
38	formatfactory.h \	38	formatfactory.h \
39	formatplugin.h \	39	formatplugin.h \
40	phonenumber.h \	40	phonenumber.h \
41	distributionlist.h \	41	distributionlist.h \
42	distributionlistdialog.h \	42	distributionlistdialog.h \
43	distributionlisteditor.h \	43	distributionlisteditor.h \
44	vcardformatplugin.h \	44	vcardformatplugin.h \
45	formats/vcardformatplugin2.h \	45	formats/vcardformatplugin2.h \
46	picture.h \	46	picture.h \
47	secrecy.h \	47	secrecy.h \
48	sound.h \	48	sound.h \
49	addressbook.h \	49	addressbook.h \
50	syncprefwidget.h \	50	syncprefwidget.h \
51	timezone.h \	51	timezone.h \
52	tmpaddressbook.h \	52	tmpaddressbook.h \
53	addressee.h \	53	addressee.h \
54	addresseedialog.h \	54	addresseedialog.h \
55	vcardconverter.h \	55	vcardconverter.h \
56	vcard21parser.h \	56	vcard21parser.h \
57	vcardformatimpl.h \	57	vcardformatimpl.h \
58	plugins/file/resourcefile.h \	58	plugins/file/resourcefile.h \


diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro index 62a66eb..dfdbcff 100644 --- a/kabc/kabcE.pro +++ b/kabc/kabcE.pro
@@ -1,54 +1,54 @@
1	TEMPLATE= lib	1	TEMPLATE= lib
2	CONFIG += qt warn_on	2	CONFIG += qt warn_on
3	TARGET = microkabc	3	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)
9	DESTDIR = $(QPEDIR)/lib	9	DESTDIR = $(QPEDIR)/lib
10	LIBS += -lmicrokde	10	LIBS += -lmicrokde
11	LIBS += -lmicrokdepim	11	LIBS += -lmicrokdepim
12	#LIBS += -lldap	12	#LIBS += -lldap
13	LIBS += -L$(QPEDIR)/lib	13	LIBS += -L$(QPEDIR)/lib
14	DEFINES += KAB_EMBEDDED	14	DEFINES += KAB_EMBEDDED
15		15
16	INTERFACES = \	16	INTERFACES = \
17		17
18	HEADERS = \	18	HEADERS = \
19	address.h \	19	address.h \
20	addressbook.h \	20	addressbook.h \
21	addressee.h \	21	addressee.h \
22	addresseedialog.h \	22	addresseedialog.h \
23	addresseelist.h \	23	addresseelist.h \
24	agent.h \	24	agent.h \
25	distributionlist.h \	25	distributionlist.h \
26	distributionlistdialog.h \	26	distributionlistdialog.h \
27	distributionlisteditor.h \	27	distributionlisteditor.h \
28	field.h \	28	field.h \
29	formatfactory.h \	29	formatfactory.h \
30	formatplugin.h \	30	formatplugin.h \
31	geo.h \	31	geo.h \
32	key.h \	32	key.h \
33	phonenumber.h \	33	phonenumber.h \
34	picture.h \	34	picture.h \
35	plugin.h \	35	plugin.h \
36	resource.h \	36	resource.h \
37	secrecy.h \	37	secrecy.h \
38	sound.h \	38	sound.h \
39	stdaddressbook.h \	39	stdaddressbook.h \
40	syncprefwidget.h \	40	syncprefwidget.h \
41	timezone.h \	41	timezone.h \
42	tmpaddressbook.h \	42	tmpaddressbook.h \
43	vcardconverter.h \	43	vcardconverter.h \
44	vcard21parser.h \	44	vcard21parser.h \
45	vcardformatimpl.h \	45	vcardformatimpl.h \
46	vcardformatplugin.h \	46	vcardformatplugin.h \
47	vcardparser/vcardline.h \	47	vcardparser/vcardline.h \
48	vcardparser/vcard.h \	48	vcardparser/vcard.h \
49	vcardparser/vcardtool.h \	49	vcardparser/vcardtool.h \
50	vcardparser/vcardparser.h \	50	vcardparser/vcardparser.h \
51	vcard/include/VCardAdrParam.h \	51	vcard/include/VCardAdrParam.h \
52	vcard/include/VCardAdrValue.h \	52	vcard/include/VCardAdrValue.h \
53	vcard/include/VCardAgentParam.h \	53	vcard/include/VCardAgentParam.h \
54	vcard/include/VCardContentLine.h \	54	vcard/include/VCardContentLine.h \