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 /korganizer
parent: 945f620dd57338d5b920f4ada3ff8e9e8d1cfe74 (diff)
download: kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.zip
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.gz
kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.bz2
2 files changed, 3 insertions, 4 deletions
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index e501d88..ca69e14 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,193 +1,193 @@
        TEMPLATE= app
        CONFIG  = qt warn_on 
        TARGET  = kopi
 OBJECTS_DIR = _obj/
 MOC_DIR = _moc
 DESTDIR= ../bin
 include( ../variables.pri )
-INCLUDEPATH += ../microkde  ../ interfaces ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../microkde/kio/kio
+INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/microkde  interfaces $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio
 #../qtcompat
 DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #KORG_NOPRINTER KORG_NOKABC 
 DEFINES += KORG_NOLVALTERNATION
 DEFINES +=  DESKTOP_VERSION
 unix : {
 LIBS += ../bin/libmicrokdepim.so
 LIBS += ../bin/libmicrokcal.so
 LIBS += ../bin/libmicrokde.so
 LIBS += ../bin/libmicrokabc.so
 LIBS += ../bin/libmicrogammu.so
 LIBS += -lbluetooth
 LIBS += -lsdp
 LIBS += -lldap
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_  
 LIBS += ../bin/microkdepim.lib
 LIBS += ../bin/microkcal.lib
 LIBS += ../bin/microkde.lib
 LIBS += ../bin/microkabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 LIBS += mfc71u.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 #QMAKE_LINK += /NODEFAULTLIB:MSVCRT
 #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 
 INTERFACES = kofilterview_base.ui
 #  filteredit_base.ui
 # kdateedit.h \
 HEADERS = \
 filteredit_base.h \
 alarmclient.h \
 calendarview.h \
 customlistviewitem.h \
 datenavigator.h \
 docprefs.h \
 filtereditdialog.h \
 incomingdialog.h \
 incomingdialog_base.h \
 interfaces/korganizer/baseview.h \
 interfaces/korganizer/calendarviewbase.h \
 journalentry.h \
 kdatenavigator.h \
 koagenda.h \
 koagendaitem.h \
 koagendaview.h \
 kocounterdialog.h \
 kodaymatrix.h \
 kodialogmanager.h \
 koeditordetails.h \
 koeditorgeneral.h \
 koeditorgeneralevent.h \
 koeditorgeneraltodo.h \
 koeditorrecurrence.h \
 koeventeditor.h \
 koeventpopupmenu.h \
 koeventview.h \
 koeventviewer.h \
 koeventviewerdialog.h \
 kofilterview.h \
 koglobals.h \
 koincidenceeditor.h \
 kojournalview.h \
 kolistview.h \
 kolocationbox.h \
 komonthview.h \
 koprefs.h \
 koprefsdialog.h \
 kotimespanview.h \
 kotodoeditor.h \
 kotodoview.h \
 kotodoviewitem.h \
 koviewmanager.h \
 kowhatsnextview.h \
 ktimeedit.h \
 lineview.h \
 mainwindow.h \
 navigatorbar.h \
 outgoingdialog.h \
 outgoingdialog_base.h \
 publishdialog.h \
 publishdialog_base.h \
 savetemplatedialog.h \
 searchdialog.h \
 simplealarmclient.h \
 statusdialog.h \
 timeline.h \
 timespanview.h \
 version.h \
 ../kalarmd/alarmdialog.h \
 SOURCES = \ 
 filteredit_base.cpp \
 calendarview.cpp \
 datenavigator.cpp \
 docprefs.cpp \
 filtereditdialog.cpp \
 incomingdialog.cpp \
 incomingdialog_base.cpp \
 journalentry.cpp \
 kdatenavigator.cpp \
 koagenda.cpp \
 koagendaitem.cpp \
 koagendaview.cpp \
 kocounterdialog.cpp \
 kodaymatrix.cpp \
 kodialogmanager.cpp \
 koeditordetails.cpp \
 koeditorgeneral.cpp \
 koeditorgeneralevent.cpp \
 koeditorgeneraltodo.cpp \
 koeditorrecurrence.cpp \
 koeventeditor.cpp \
 koeventpopupmenu.cpp \
 koeventview.cpp \
 koeventviewer.cpp \
 koeventviewerdialog.cpp \
 kofilterview.cpp \
 koglobals.cpp \
 koincidenceeditor.cpp \
 kojournalview.cpp \
 kolistview.cpp \
 kolocationbox.cpp \
 komonthview.cpp \
 koprefs.cpp \
 koprefsdialog.cpp \
 kotimespanview.cpp \
 kotodoeditor.cpp \
 kotodoview.cpp \
 kotodoviewitem.cpp \
 koviewmanager.cpp \
 kowhatsnextview.cpp \
 ktimeedit.cpp \
 lineview.cpp \
 main.cpp \
 mainwindow.cpp \
 navigatorbar.cpp \
 outgoingdialog.cpp \
 outgoingdialog_base.cpp \
 publishdialog.cpp \
 publishdialog_base.cpp \
 savetemplatedialog.cpp \
 searchdialog.cpp \
 simplealarmclient.cpp \
 statusdialog.cpp \
 timeline.cpp \
 timespanview.cpp \
 ../kalarmd/alarmdialog.cpp
 HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
 INTERFACES += calprintdayconfig_base.ui \
              calprintmonthconfig_base.ui \
              calprinttodoconfig_base.ui \
              calprintweekconfig_base.ui
 SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
 win32: {
 HEADERS += ../outport/msoutl9.h \
 koimportoldialog.h 
 SOURCES += ../outport/msoutl9.cpp \
 koimportoldialog.cpp 
 }
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index b39de35..16c27d1 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -1,156 +1,155 @@
        TEMPLATE= app
        CONFIG  += qt warn_on
        TARGET  = kopi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
-INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../qtcompat ../ interfaces  ../kabc $(QPEDIR)/include
+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
-#../libkabcwrap
 DEFINES += KORG_NODND KORG_NOPLUGINS  KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 DEFINES += KORG_NOLVALTERNATION
 #KORG_NOKABC
 LIBS += -lmicrokdepim
 LIBS += -lmicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
 LIBS += -lmicrokabc
-#LIBS += -lmicrokabcwrap
 #LIBS +=  $(QPEDIR)/lib/gammu
 LIBS += -lmicrogammu
 LIBS += -lbluetooth
 LIBS += -lsdp
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES =  kofilterview_base.ui 
 #filteredit_base.ui
 HEADERS = \
 wordsgerman.h \
 filteredit_base.h \
 alarmclient.h \
 calendarview.h \
 customlistviewitem.h \
 datenavigator.h \
 docprefs.h \
 filtereditdialog.h \
 incomingdialog.h \
 incomingdialog_base.h \
 interfaces/korganizer/baseview.h \
 interfaces/korganizer/calendarviewbase.h \
 journalentry.h \
 kdateedit.h \
 kdatenavigator.h \
 koagenda.h \
 koagendaitem.h \
 koagendaview.h \
 kocounterdialog.h \
 kodaymatrix.h \
 kodialogmanager.h \
 koeditordetails.h \
 koeditorgeneral.h \
 koeditorgeneralevent.h \
 koeditorgeneraltodo.h \
 koeditorrecurrence.h \
 koeventeditor.h \
 koeventpopupmenu.h \
 koeventview.h \
 koeventviewer.h \
 koeventviewerdialog.h \
 kofilterview.h \
 koglobals.h \
 koincidenceeditor.h \
 kojournalview.h \
 kolistview.h \
 kolocationbox.h \
 komonthview.h \
 koprefs.h \
 koprefsdialog.h \
 kotimespanview.h \
 kotodoeditor.h \
 kotodoview.h \
 kotodoviewitem.h \
 koviewmanager.h \
 kowhatsnextview.h \
 ktimeedit.h \
 lineview.h \
 mainwindow.h \
 navigatorbar.h \
 outgoingdialog.h \
 outgoingdialog_base.h \
 publishdialog.h \
 publishdialog_base.h \
 savetemplatedialog.h \
 searchdialog.h \
 simplealarmclient.h \
 statusdialog.h \
 timeline.h \
 timespanview.h \
 version.h \
 ../kalarmd/alarmdialog.h
 SOURCES = \
 filteredit_base.cpp \
 calendarview.cpp \
 datenavigator.cpp \
 docprefs.cpp \
 filtereditdialog.cpp \
 incomingdialog.cpp \
 incomingdialog_base.cpp \
 journalentry.cpp \
 kdatenavigator.cpp \
 koagenda.cpp \
 koagendaitem.cpp \
 koagendaview.cpp \
 kocounterdialog.cpp \
 kodaymatrix.cpp \
 kodialogmanager.cpp \
 koeditordetails.cpp \
 koeditorgeneral.cpp \
 koeditorgeneralevent.cpp \
 koeditorgeneraltodo.cpp \
 koeditorrecurrence.cpp \
 koeventeditor.cpp \
 koeventpopupmenu.cpp \
 koeventview.cpp \
 koeventviewer.cpp \
 koeventviewerdialog.cpp \
 kofilterview.cpp \
 koglobals.cpp \
 koincidenceeditor.cpp \
 kojournalview.cpp \
 kolistview.cpp \
 kolocationbox.cpp \
 komonthview.cpp \
 koprefs.cpp \
 koprefsdialog.cpp \
 kotimespanview.cpp \
 kotodoeditor.cpp \
 kotodoview.cpp \
 kotodoviewitem.cpp \
 koviewmanager.cpp \
 kowhatsnextview.cpp \
 ktimeedit.cpp \
 lineview.cpp \
 main.cpp \
 mainwindow.cpp \
 navigatorbar.cpp \
 outgoingdialog.cpp \
 outgoingdialog_base.cpp \
 publishdialog.cpp \
 publishdialog_base.cpp \
 savetemplatedialog.cpp \
 searchdialog.cpp \
 simplealarmclient.cpp \
 statusdialog.cpp \
 timeline.cpp \
 timespanview.cpp \
 ../kalarmd/alarmdialog.cpp
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 /korganizer
parent	945f620dd57338d5b920f4ada3ff8e9e8d1cfe74 (diff)
download	kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.zip kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.gz kdepimpi-afb21584fdb4dcc201fca13b4c5129fdf2e90154.tar.bz2

diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index e501d88..ca69e14 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro
@@ -1,193 +1,193 @@
1	TEMPLATE= app	1	TEMPLATE= app
2	CONFIG = qt warn_on	2	CONFIG = qt warn_on
3	TARGET = kopi	3	TARGET = kopi
4	OBJECTS_DIR = _obj/	4	OBJECTS_DIR = _obj/
5	MOC_DIR = _moc	5	MOC_DIR = _moc
6	DESTDIR= ../bin	6	DESTDIR= ../bin
7		7
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
13	DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER	13	DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
14	#KORG_NOPRINTER KORG_NOKABC	14	#KORG_NOPRINTER KORG_NOKABC
15	DEFINES += KORG_NOLVALTERNATION	15	DEFINES += KORG_NOLVALTERNATION
16	DEFINES += DESKTOP_VERSION	16	DEFINES += DESKTOP_VERSION
17	unix : {	17	unix : {
18	LIBS += ../bin/libmicrokdepim.so	18	LIBS += ../bin/libmicrokdepim.so
19	LIBS += ../bin/libmicrokcal.so	19	LIBS += ../bin/libmicrokcal.so
20	LIBS += ../bin/libmicrokde.so	20	LIBS += ../bin/libmicrokde.so
21	LIBS += ../bin/libmicrokabc.so	21	LIBS += ../bin/libmicrokabc.so
22	LIBS += ../bin/libmicrogammu.so	22	LIBS += ../bin/libmicrogammu.so
23	LIBS += -lbluetooth	23	LIBS += -lbluetooth
24	LIBS += -lsdp	24	LIBS += -lsdp
25		25
26	LIBS += -lldap	26	LIBS += -lldap
27	OBJECTS_DIR = obj/unix	27	OBJECTS_DIR = obj/unix
28	MOC_DIR = moc/unix	28	MOC_DIR = moc/unix
29	}	29	}
30	win32: {	30	win32: {
31	DEFINES += _WIN32_	31	DEFINES += _WIN32_
32	LIBS += ../bin/microkdepim.lib	32	LIBS += ../bin/microkdepim.lib
33	LIBS += ../bin/microkcal.lib	33	LIBS += ../bin/microkcal.lib
34	LIBS += ../bin/microkde.lib	34	LIBS += ../bin/microkde.lib
35	LIBS += ../bin/microkabc.lib	35	LIBS += ../bin/microkabc.lib
36	LIBS += ../libical/lib/ical.lib	36	LIBS += ../libical/lib/ical.lib
37	LIBS += ../libical/lib/icalss.lib	37	LIBS += ../libical/lib/icalss.lib
38	#LIBS += atls.lib	38	#LIBS += atls.lib
39	LIBS += mfc71u.lib	39	LIBS += mfc71u.lib
40	QMAKE_LINK += /NODEFAULTLIB:LIBC	40	QMAKE_LINK += /NODEFAULTLIB:LIBC
41	#QMAKE_LINK += /NODEFAULTLIB:MSVCRT	41	#QMAKE_LINK += /NODEFAULTLIB:MSVCRT
42	#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib	42	#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
43	OBJECTS_DIR = obj/win	43	OBJECTS_DIR = obj/win
44	MOC_DIR = moc/win	44	MOC_DIR = moc/win
45	}	45	}
46		46
47		47
48	INTERFACES = kofilterview_base.ui	48	INTERFACES = kofilterview_base.ui
49	# filteredit_base.ui	49	# filteredit_base.ui
50		50
51	# kdateedit.h \	51	# kdateedit.h \
52		52
53	HEADERS = \	53	HEADERS = \
54	filteredit_base.h \	54	filteredit_base.h \
55	alarmclient.h \	55	alarmclient.h \
56	calendarview.h \	56	calendarview.h \
57	customlistviewitem.h \	57	customlistviewitem.h \
58	datenavigator.h \	58	datenavigator.h \
59	docprefs.h \	59	docprefs.h \
60	filtereditdialog.h \	60	filtereditdialog.h \
61	incomingdialog.h \	61	incomingdialog.h \
62	incomingdialog_base.h \	62	incomingdialog_base.h \
63	interfaces/korganizer/baseview.h \	63	interfaces/korganizer/baseview.h \
64	interfaces/korganizer/calendarviewbase.h \	64	interfaces/korganizer/calendarviewbase.h \
65	journalentry.h \	65	journalentry.h \
66	kdatenavigator.h \	66	kdatenavigator.h \
67	koagenda.h \	67	koagenda.h \
68	koagendaitem.h \	68	koagendaitem.h \
69	koagendaview.h \	69	koagendaview.h \
70	kocounterdialog.h \	70	kocounterdialog.h \
71	kodaymatrix.h \	71	kodaymatrix.h \
72	kodialogmanager.h \	72	kodialogmanager.h \
73	koeditordetails.h \	73	koeditordetails.h \
74	koeditorgeneral.h \	74	koeditorgeneral.h \
75	koeditorgeneralevent.h \	75	koeditorgeneralevent.h \
76	koeditorgeneraltodo.h \	76	koeditorgeneraltodo.h \
77	koeditorrecurrence.h \	77	koeditorrecurrence.h \
78	koeventeditor.h \	78	koeventeditor.h \
79	koeventpopupmenu.h \	79	koeventpopupmenu.h \
80	koeventview.h \	80	koeventview.h \
81	koeventviewer.h \	81	koeventviewer.h \
82	koeventviewerdialog.h \	82	koeventviewerdialog.h \
83	kofilterview.h \	83	kofilterview.h \
84	koglobals.h \	84	koglobals.h \
85	koincidenceeditor.h \	85	koincidenceeditor.h \
86	kojournalview.h \	86	kojournalview.h \
87	kolistview.h \	87	kolistview.h \
88	kolocationbox.h \	88	kolocationbox.h \
89	komonthview.h \	89	komonthview.h \
90	koprefs.h \	90	koprefs.h \
91	koprefsdialog.h \	91	koprefsdialog.h \
92	kotimespanview.h \	92	kotimespanview.h \
93	kotodoeditor.h \	93	kotodoeditor.h \
94	kotodoview.h \	94	kotodoview.h \
95	kotodoviewitem.h \	95	kotodoviewitem.h \
96	koviewmanager.h \	96	koviewmanager.h \
97	kowhatsnextview.h \	97	kowhatsnextview.h \
98	ktimeedit.h \	98	ktimeedit.h \
99	lineview.h \	99	lineview.h \
100	mainwindow.h \	100	mainwindow.h \
101	navigatorbar.h \	101	navigatorbar.h \
102	outgoingdialog.h \	102	outgoingdialog.h \
103	outgoingdialog_base.h \	103	outgoingdialog_base.h \
104	publishdialog.h \	104	publishdialog.h \
105	publishdialog_base.h \	105	publishdialog_base.h \
106	savetemplatedialog.h \	106	savetemplatedialog.h \
107	searchdialog.h \	107	searchdialog.h \
108	simplealarmclient.h \	108	simplealarmclient.h \
109	statusdialog.h \	109	statusdialog.h \
110	timeline.h \	110	timeline.h \
111	timespanview.h \	111	timespanview.h \
112	version.h \	112	version.h \
113	../kalarmd/alarmdialog.h \	113	../kalarmd/alarmdialog.h \
114		114
115		115
116	SOURCES = \	116	SOURCES = \
117	filteredit_base.cpp \	117	filteredit_base.cpp \
118	calendarview.cpp \	118	calendarview.cpp \
119	datenavigator.cpp \	119	datenavigator.cpp \
120	docprefs.cpp \	120	docprefs.cpp \
121	filtereditdialog.cpp \	121	filtereditdialog.cpp \
122	incomingdialog.cpp \	122	incomingdialog.cpp \
123	incomingdialog_base.cpp \	123	incomingdialog_base.cpp \
124	journalentry.cpp \	124	journalentry.cpp \
125	kdatenavigator.cpp \	125	kdatenavigator.cpp \
126	koagenda.cpp \	126	koagenda.cpp \
127	koagendaitem.cpp \	127	koagendaitem.cpp \
128	koagendaview.cpp \	128	koagendaview.cpp \
129	kocounterdialog.cpp \	129	kocounterdialog.cpp \
130	kodaymatrix.cpp \	130	kodaymatrix.cpp \
131	kodialogmanager.cpp \	131	kodialogmanager.cpp \
132	koeditordetails.cpp \	132	koeditordetails.cpp \
133	koeditorgeneral.cpp \	133	koeditorgeneral.cpp \
134	koeditorgeneralevent.cpp \	134	koeditorgeneralevent.cpp \
135	koeditorgeneraltodo.cpp \	135	koeditorgeneraltodo.cpp \
136	koeditorrecurrence.cpp \	136	koeditorrecurrence.cpp \
137	koeventeditor.cpp \	137	koeventeditor.cpp \
138	koeventpopupmenu.cpp \	138	koeventpopupmenu.cpp \
139	koeventview.cpp \	139	koeventview.cpp \
140	koeventviewer.cpp \	140	koeventviewer.cpp \
141	koeventviewerdialog.cpp \	141	koeventviewerdialog.cpp \
142	kofilterview.cpp \	142	kofilterview.cpp \
143	koglobals.cpp \	143	koglobals.cpp \
144	koincidenceeditor.cpp \	144	koincidenceeditor.cpp \
145	kojournalview.cpp \	145	kojournalview.cpp \
146	kolistview.cpp \	146	kolistview.cpp \
147	kolocationbox.cpp \	147	kolocationbox.cpp \
148	komonthview.cpp \	148	komonthview.cpp \
149	koprefs.cpp \	149	koprefs.cpp \
150	koprefsdialog.cpp \	150	koprefsdialog.cpp \
151	kotimespanview.cpp \	151	kotimespanview.cpp \
152	kotodoeditor.cpp \	152	kotodoeditor.cpp \
153	kotodoview.cpp \	153	kotodoview.cpp \
154	kotodoviewitem.cpp \	154	kotodoviewitem.cpp \
155	koviewmanager.cpp \	155	koviewmanager.cpp \
156	kowhatsnextview.cpp \	156	kowhatsnextview.cpp \
157	ktimeedit.cpp \	157	ktimeedit.cpp \
158	lineview.cpp \	158	lineview.cpp \
159	main.cpp \	159	main.cpp \
160	mainwindow.cpp \	160	mainwindow.cpp \
161	navigatorbar.cpp \	161	navigatorbar.cpp \
162	outgoingdialog.cpp \	162	outgoingdialog.cpp \
163	outgoingdialog_base.cpp \	163	outgoingdialog_base.cpp \
164	publishdialog.cpp \	164	publishdialog.cpp \
165	publishdialog_base.cpp \	165	publishdialog_base.cpp \
166	savetemplatedialog.cpp \	166	savetemplatedialog.cpp \
167	searchdialog.cpp \	167	searchdialog.cpp \
168	simplealarmclient.cpp \	168	simplealarmclient.cpp \
169	statusdialog.cpp \	169	statusdialog.cpp \
170	timeline.cpp \	170	timeline.cpp \
171	timespanview.cpp \	171	timespanview.cpp \
172	../kalarmd/alarmdialog.cpp	172	../kalarmd/alarmdialog.cpp
173		173
174	HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h	174	HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
175	INTERFACES += calprintdayconfig_base.ui \	175	INTERFACES += calprintdayconfig_base.ui \
176	calprintmonthconfig_base.ui \	176	calprintmonthconfig_base.ui \
177	calprinttodoconfig_base.ui \	177	calprinttodoconfig_base.ui \
178	calprintweekconfig_base.ui	178	calprintweekconfig_base.ui
179	SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp	179	SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
180		180
181		181
182		182
183	win32: {	183	win32: {
184	HEADERS += ../outport/msoutl9.h \	184	HEADERS += ../outport/msoutl9.h \
185	koimportoldialog.h	185	koimportoldialog.h
186		186
187		187
188	SOURCES += ../outport/msoutl9.cpp \	188	SOURCES += ../outport/msoutl9.cpp \
189	koimportoldialog.cpp	189	koimportoldialog.cpp
190		190
191		191
192	}	192	}
193		193


diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index b39de35..16c27d1 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro
@@ -1,156 +1,155 @@
1	TEMPLATE= app	1	TEMPLATE= app
2	CONFIG += qt warn_on	2	CONFIG += qt warn_on
3	TARGET = kopi	3	TARGET = kopi
4	OBJECTS_DIR = obj/$(PLATFORM)	4	OBJECTS_DIR = obj/$(PLATFORM)
5	MOC_DIR = moc/$(PLATFORM)	5	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
12	DEFINES += KORG_NOLVALTERNATION	12	DEFINES += KORG_NOLVALTERNATION
13	#KORG_NOKABC	13	#KORG_NOKABC
14	LIBS += -lmicrokdepim	14	LIBS += -lmicrokdepim
15	LIBS += -lmicrokcal	15	LIBS += -lmicrokcal
16	LIBS += -lmicrokde	16	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
22	LIBS += -lmicrogammu	21	LIBS += -lmicrogammu
23	LIBS += -lbluetooth	22	LIBS += -lbluetooth
24	LIBS += -lsdp	23	LIBS += -lsdp
25		24
26		25
27	LIBS += -lqpe	26	LIBS += -lqpe
28	LIBS += -ljpeg	27	LIBS += -ljpeg
29	LIBS += $(QTOPIALIB)	28	LIBS += $(QTOPIALIB)
30	LIBS += -L$(QPEDIR)/lib	29	LIBS += -L$(QPEDIR)/lib
31		30
32	INTERFACES = kofilterview_base.ui	31	INTERFACES = kofilterview_base.ui
33	#filteredit_base.ui	32	#filteredit_base.ui
34		33
35	HEADERS = \	34	HEADERS = \
36	wordsgerman.h \	35	wordsgerman.h \
37	filteredit_base.h \	36	filteredit_base.h \
38	alarmclient.h \	37	alarmclient.h \
39	calendarview.h \	38	calendarview.h \
40	customlistviewitem.h \	39	customlistviewitem.h \
41	datenavigator.h \	40	datenavigator.h \
42	docprefs.h \	41	docprefs.h \
43	filtereditdialog.h \	42	filtereditdialog.h \
44	incomingdialog.h \	43	incomingdialog.h \
45	incomingdialog_base.h \	44	incomingdialog_base.h \
46	interfaces/korganizer/baseview.h \	45	interfaces/korganizer/baseview.h \
47	interfaces/korganizer/calendarviewbase.h \	46	interfaces/korganizer/calendarviewbase.h \
48	journalentry.h \	47	journalentry.h \
49	kdateedit.h \	48	kdateedit.h \
50	kdatenavigator.h \	49	kdatenavigator.h \
51	koagenda.h \	50	koagenda.h \
52	koagendaitem.h \	51	koagendaitem.h \
53	koagendaview.h \	52	koagendaview.h \
54	kocounterdialog.h \	53	kocounterdialog.h \
55	kodaymatrix.h \	54	kodaymatrix.h \
56	kodialogmanager.h \	55	kodialogmanager.h \
57	koeditordetails.h \	56	koeditordetails.h \
58	koeditorgeneral.h \	57	koeditorgeneral.h \
59	koeditorgeneralevent.h \	58	koeditorgeneralevent.h \
60	koeditorgeneraltodo.h \	59	koeditorgeneraltodo.h \
61	koeditorrecurrence.h \	60	koeditorrecurrence.h \
62	koeventeditor.h \	61	koeventeditor.h \
63	koeventpopupmenu.h \	62	koeventpopupmenu.h \
64	koeventview.h \	63	koeventview.h \
65	koeventviewer.h \	64	koeventviewer.h \
66	koeventviewerdialog.h \	65	koeventviewerdialog.h \
67	kofilterview.h \	66	kofilterview.h \
68	koglobals.h \	67	koglobals.h \
69	koincidenceeditor.h \	68	koincidenceeditor.h \
70	kojournalview.h \	69	kojournalview.h \
71	kolistview.h \	70	kolistview.h \
72	kolocationbox.h \	71	kolocationbox.h \
73	komonthview.h \	72	komonthview.h \
74	koprefs.h \	73	koprefs.h \
75	koprefsdialog.h \	74	koprefsdialog.h \
76	kotimespanview.h \	75	kotimespanview.h \
77	kotodoeditor.h \	76	kotodoeditor.h \
78	kotodoview.h \	77	kotodoview.h \
79	kotodoviewitem.h \	78	kotodoviewitem.h \
80	koviewmanager.h \	79	koviewmanager.h \
81	kowhatsnextview.h \	80	kowhatsnextview.h \
82	ktimeedit.h \	81	ktimeedit.h \
83	lineview.h \	82	lineview.h \
84	mainwindow.h \	83	mainwindow.h \
85	navigatorbar.h \	84	navigatorbar.h \
86	outgoingdialog.h \	85	outgoingdialog.h \
87	outgoingdialog_base.h \	86	outgoingdialog_base.h \
88	publishdialog.h \	87	publishdialog.h \
89	publishdialog_base.h \	88	publishdialog_base.h \
90	savetemplatedialog.h \	89	savetemplatedialog.h \
91	searchdialog.h \	90	searchdialog.h \
92	simplealarmclient.h \	91	simplealarmclient.h \
93	statusdialog.h \	92	statusdialog.h \
94	timeline.h \	93	timeline.h \
95	timespanview.h \	94	timespanview.h \
96	version.h \	95	version.h \
97	../kalarmd/alarmdialog.h	96	../kalarmd/alarmdialog.h
98		97
99	SOURCES = \	98	SOURCES = \
100	filteredit_base.cpp \	99	filteredit_base.cpp \
101	calendarview.cpp \	100	calendarview.cpp \
102	datenavigator.cpp \	101	datenavigator.cpp \
103	docprefs.cpp \	102	docprefs.cpp \
104	filtereditdialog.cpp \	103	filtereditdialog.cpp \
105	incomingdialog.cpp \	104	incomingdialog.cpp \
106	incomingdialog_base.cpp \	105	incomingdialog_base.cpp \
107	journalentry.cpp \	106	journalentry.cpp \
108	kdatenavigator.cpp \	107	kdatenavigator.cpp \
109	koagenda.cpp \	108	koagenda.cpp \
110	koagendaitem.cpp \	109	koagendaitem.cpp \
111	koagendaview.cpp \	110	koagendaview.cpp \
112	kocounterdialog.cpp \	111	kocounterdialog.cpp \
113	kodaymatrix.cpp \	112	kodaymatrix.cpp \
114	kodialogmanager.cpp \	113	kodialogmanager.cpp \
115	koeditordetails.cpp \	114	koeditordetails.cpp \
116	koeditorgeneral.cpp \	115	koeditorgeneral.cpp \
117	koeditorgeneralevent.cpp \	116	koeditorgeneralevent.cpp \
118	koeditorgeneraltodo.cpp \	117	koeditorgeneraltodo.cpp \
119	koeditorrecurrence.cpp \	118	koeditorrecurrence.cpp \
120	koeventeditor.cpp \	119	koeventeditor.cpp \
121	koeventpopupmenu.cpp \	120	koeventpopupmenu.cpp \
122	koeventview.cpp \	121	koeventview.cpp \
123	koeventviewer.cpp \	122	koeventviewer.cpp \
124	koeventviewerdialog.cpp \	123	koeventviewerdialog.cpp \
125	kofilterview.cpp \	124	kofilterview.cpp \
126	koglobals.cpp \	125	koglobals.cpp \
127	koincidenceeditor.cpp \	126	koincidenceeditor.cpp \
128	kojournalview.cpp \	127	kojournalview.cpp \
129	kolistview.cpp \	128	kolistview.cpp \
130	kolocationbox.cpp \	129	kolocationbox.cpp \
131	komonthview.cpp \	130	komonthview.cpp \
132	koprefs.cpp \	131	koprefs.cpp \
133	koprefsdialog.cpp \	132	koprefsdialog.cpp \
134	kotimespanview.cpp \	133	kotimespanview.cpp \
135	kotodoeditor.cpp \	134	kotodoeditor.cpp \
136	kotodoview.cpp \	135	kotodoview.cpp \
137	kotodoviewitem.cpp \	136	kotodoviewitem.cpp \
138	koviewmanager.cpp \	137	koviewmanager.cpp \
139	kowhatsnextview.cpp \	138	kowhatsnextview.cpp \
140	ktimeedit.cpp \	139	ktimeedit.cpp \
141	lineview.cpp \	140	lineview.cpp \
142	main.cpp \	141	main.cpp \
143	mainwindow.cpp \	142	mainwindow.cpp \
144	navigatorbar.cpp \	143	navigatorbar.cpp \
145	outgoingdialog.cpp \	144	outgoingdialog.cpp \
146	outgoingdialog_base.cpp \	145	outgoingdialog_base.cpp \
147	publishdialog.cpp \	146	publishdialog.cpp \
148	publishdialog_base.cpp \	147	publishdialog_base.cpp \
149	savetemplatedialog.cpp \	148	savetemplatedialog.cpp \
150	searchdialog.cpp \	149	searchdialog.cpp \
151	simplealarmclient.cpp \	150	simplealarmclient.cpp \
152	statusdialog.cpp \	151	statusdialog.cpp \
153	timeline.cpp \	152	timeline.cpp \
154	timespanview.cpp \	153	timespanview.cpp \
155	../kalarmd/alarmdialog.cpp	154	../kalarmd/alarmdialog.cpp
156		155