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 |
implemented new include strategy for makefiles
-rw-r--r-- | kabc/kabc.pro | 2 | ||||
-rw-r--r-- | kabc/kabcE.pro | 2 |
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,106 +1,106 @@ | |||
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 \ |
59 | plugins/file/resourcefileconfig.h \ | 59 | plugins/file/resourcefileconfig.h \ |
60 | plugins/dir/resourcedir.h \ | 60 | plugins/dir/resourcedir.h \ |
61 | plugins/dir/resourcedirconfig.h \ | 61 | plugins/dir/resourcedirconfig.h \ |
62 | vcardparser/vcardline.h \ | 62 | vcardparser/vcardline.h \ |
63 | vcardparser/vcard.h \ | 63 | vcardparser/vcard.h \ |
64 | vcardparser/vcardtool.h \ | 64 | vcardparser/vcardtool.h \ |
65 | vcardparser/vcardparser.h \ | 65 | vcardparser/vcardparser.h \ |
66 | vcard/include/VCardAdrParam.h \ | 66 | vcard/include/VCardAdrParam.h \ |
67 | vcard/include/VCardAdrValue.h \ | 67 | vcard/include/VCardAdrValue.h \ |
68 | vcard/include/VCardAgentParam.h \ | 68 | vcard/include/VCardAgentParam.h \ |
69 | vcard/include/VCardContentLine.h \ | 69 | vcard/include/VCardContentLine.h \ |
70 | vcard/include/VCardDateParam.h \ | 70 | vcard/include/VCardDateParam.h \ |
71 | vcard/include/VCardDateValue.h \ | 71 | vcard/include/VCardDateValue.h \ |
72 | vcard/include/VCardEmailParam.h \ | 72 | vcard/include/VCardEmailParam.h \ |
73 | vcard/include/VCardGeoValue.h \ | 73 | vcard/include/VCardGeoValue.h \ |
74 | vcard/include/VCardGroup.h \ | 74 | vcard/include/VCardGroup.h \ |
75 | vcard/include/VCardImageParam.h \ | 75 | vcard/include/VCardImageParam.h \ |
76 | vcard/include/VCardImageValue.h \ | 76 | vcard/include/VCardImageValue.h \ |
77 | vcard/include/VCardLangValue.h \ | 77 | vcard/include/VCardLangValue.h \ |
78 | vcard/include/VCardNValue.h \ | 78 | vcard/include/VCardNValue.h \ |
79 | vcard/include/VCardParam.h \ | 79 | vcard/include/VCardParam.h \ |
80 | vcard/include/VCardPhoneNumberValue.h \ | 80 | vcard/include/VCardPhoneNumberValue.h \ |
81 | vcard/include/VCardSourceParam.h \ | 81 | vcard/include/VCardSourceParam.h \ |
82 | vcard/include/VCardTelParam.h \ | 82 | vcard/include/VCardTelParam.h \ |
83 | vcard/include/VCardTextParam.h \ | 83 | vcard/include/VCardTextParam.h \ |
84 | vcard/include/VCardTextNSParam.h \ | 84 | vcard/include/VCardTextNSParam.h \ |
85 | vcard/include/VCardTextValue.h \ | 85 | vcard/include/VCardTextValue.h \ |
86 | vcard/include/VCardTextBinParam.h \ | 86 | vcard/include/VCardTextBinParam.h \ |
87 | vcard/include/VCardURIValue.h \ | 87 | vcard/include/VCardURIValue.h \ |
88 | vcard/include/VCardVCard.h \ | 88 | vcard/include/VCardVCard.h \ |
89 | vcard/include/VCardEntity.h \ | 89 | vcard/include/VCardEntity.h \ |
90 | vcard/include/VCardValue.h \ | 90 | vcard/include/VCardValue.h \ |
91 | vcard/include/VCardSoundValue.h \ | 91 | vcard/include/VCardSoundValue.h \ |
92 | vcard/include/VCardAgentValue.h \ | 92 | vcard/include/VCardAgentValue.h \ |
93 | vcard/include/VCardTelValue.h \ | 93 | vcard/include/VCardTelValue.h \ |
94 | vcard/include/VCardTextBinValue.h \ | 94 | vcard/include/VCardTextBinValue.h \ |
95 | vcard/include/VCardOrgValue.h \ | 95 | vcard/include/VCardOrgValue.h \ |
96 | vcard/include/VCardUTCValue.h \ | 96 | vcard/include/VCardUTCValue.h \ |
97 | vcard/include/VCardClassValue.h \ | 97 | vcard/include/VCardClassValue.h \ |
98 | vcard/include/VCardFloatValue.h \ | 98 | vcard/include/VCardFloatValue.h \ |
99 | vcard/include/VCardTextListValue.h \ | 99 | vcard/include/VCardTextListValue.h \ |
100 | vcard/include/generated/AdrParam-generated.h \ | 100 | vcard/include/generated/AdrParam-generated.h \ |
101 | vcard/include/generated/AdrValue-generated.h \ | 101 | vcard/include/generated/AdrValue-generated.h \ |
102 | vcard/include/generated/AgentParam-generated.h \ | 102 | vcard/include/generated/AgentParam-generated.h \ |
103 | vcard/include/generated/ContentLine-generated.h \ | 103 | vcard/include/generated/ContentLine-generated.h \ |
104 | vcard/include/generated/DateParam-generated.h \ | 104 | vcard/include/generated/DateParam-generated.h \ |
105 | vcard/include/generated/DateValue-generated.h \ | 105 | vcard/include/generated/DateValue-generated.h \ |
106 | vcard/include/generated/EmailParam-generated.h \ | 106 | vcard/include/generated/EmailParam-generated.h \ |
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro index 62a66eb..dfdbcff 100644 --- a/kabc/kabcE.pro +++ b/kabc/kabcE.pro | |||
@@ -1,102 +1,102 @@ | |||
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 \ |
55 | vcard/include/VCardDateParam.h \ | 55 | vcard/include/VCardDateParam.h \ |
56 | vcard/include/VCardDateValue.h \ | 56 | vcard/include/VCardDateValue.h \ |
57 | vcard/include/VCardEmailParam.h \ | 57 | vcard/include/VCardEmailParam.h \ |
58 | vcard/include/VCardGeoValue.h \ | 58 | vcard/include/VCardGeoValue.h \ |
59 | vcard/include/VCardGroup.h \ | 59 | vcard/include/VCardGroup.h \ |
60 | vcard/include/VCardImageParam.h \ | 60 | vcard/include/VCardImageParam.h \ |
61 | vcard/include/VCardImageValue.h \ | 61 | vcard/include/VCardImageValue.h \ |
62 | vcard/include/VCardLangValue.h \ | 62 | vcard/include/VCardLangValue.h \ |
63 | vcard/include/VCardNValue.h \ | 63 | vcard/include/VCardNValue.h \ |
64 | vcard/include/VCardParam.h \ | 64 | vcard/include/VCardParam.h \ |
65 | vcard/include/VCardPhoneNumberValue.h \ | 65 | vcard/include/VCardPhoneNumberValue.h \ |
66 | vcard/include/VCardSourceParam.h \ | 66 | vcard/include/VCardSourceParam.h \ |
67 | vcard/include/VCardTelParam.h \ | 67 | vcard/include/VCardTelParam.h \ |
68 | vcard/include/VCardTextParam.h \ | 68 | vcard/include/VCardTextParam.h \ |
69 | vcard/include/VCardTextNSParam.h \ | 69 | vcard/include/VCardTextNSParam.h \ |
70 | vcard/include/VCardTextValue.h \ | 70 | vcard/include/VCardTextValue.h \ |
71 | vcard/include/VCardTextBinParam.h \ | 71 | vcard/include/VCardTextBinParam.h \ |
72 | vcard/include/VCardURIValue.h \ | 72 | vcard/include/VCardURIValue.h \ |
73 | vcard/include/VCardVCard.h \ | 73 | vcard/include/VCardVCard.h \ |
74 | vcard/include/VCardEntity.h \ | 74 | vcard/include/VCardEntity.h \ |
75 | vcard/include/VCardValue.h \ | 75 | vcard/include/VCardValue.h \ |
76 | vcard/include/VCardSoundValue.h \ | 76 | vcard/include/VCardSoundValue.h \ |
77 | vcard/include/VCardAgentValue.h \ | 77 | vcard/include/VCardAgentValue.h \ |
78 | vcard/include/VCardTelValue.h \ | 78 | vcard/include/VCardTelValue.h \ |
79 | vcard/include/VCardTextBinValue.h \ | 79 | vcard/include/VCardTextBinValue.h \ |
80 | vcard/include/VCardOrgValue.h \ | 80 | vcard/include/VCardOrgValue.h \ |
81 | vcard/include/VCardUTCValue.h \ | 81 | vcard/include/VCardUTCValue.h \ |
82 | vcard/include/VCardClassValue.h \ | 82 | vcard/include/VCardClassValue.h \ |
83 | vcard/include/VCardFloatValue.h \ | 83 | vcard/include/VCardFloatValue.h \ |
84 | vcard/include/VCardTextListValue.h \ | 84 | vcard/include/VCardTextListValue.h \ |
85 | vcard/include/generated/AdrParam-generated.h \ | 85 | vcard/include/generated/AdrParam-generated.h \ |
86 | vcard/include/generated/AdrValue-generated.h \ | 86 | vcard/include/generated/AdrValue-generated.h \ |
87 | vcard/include/generated/AgentParam-generated.h \ | 87 | vcard/include/generated/AgentParam-generated.h \ |
88 | vcard/include/generated/ContentLine-generated.h \ | 88 | vcard/include/generated/ContentLine-generated.h \ |
89 | vcard/include/generated/DateParam-generated.h \ | 89 | vcard/include/generated/DateParam-generated.h \ |
90 | vcard/include/generated/DateValue-generated.h \ | 90 | vcard/include/generated/DateValue-generated.h \ |
91 | vcard/include/generated/EmailParam-generated.h \ | 91 | vcard/include/generated/EmailParam-generated.h \ |
92 | vcard/include/generated/GeoValue-generated.h \ | 92 | vcard/include/generated/GeoValue-generated.h \ |
93 | vcard/include/generated/Group-generated.h \ | 93 | vcard/include/generated/Group-generated.h \ |
94 | vcard/include/generated/ImageParam-generated.h \ | 94 | vcard/include/generated/ImageParam-generated.h \ |
95 | vcard/include/generated/ImageValue-generated.h \ | 95 | vcard/include/generated/ImageValue-generated.h \ |
96 | vcard/include/generated/LangValue-generated.h \ | 96 | vcard/include/generated/LangValue-generated.h \ |
97 | vcard/include/generated/NValue-generated.h \ | 97 | vcard/include/generated/NValue-generated.h \ |
98 | vcard/include/generated/Param-generated.h \ | 98 | vcard/include/generated/Param-generated.h \ |
99 | vcard/include/generated/PhoneNumberValue-generated.h \ | 99 | vcard/include/generated/PhoneNumberValue-generated.h \ |
100 | vcard/include/generated/SourceParam-generated.h \ | 100 | vcard/include/generated/SourceParam-generated.h \ |
101 | vcard/include/generated/TelParam-generated.h \ | 101 | vcard/include/generated/TelParam-generated.h \ |
102 | vcard/include/generated/TextParam-generated.h \ | 102 | vcard/include/generated/TextParam-generated.h \ |