1 files changed, 62 insertions, 60 deletions
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 0fc6dae..8e379d3 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -1,15 +1,13 @@
        TEMPLATE= app
        CONFIG  += qtopia warn_on release
-win32:DEFINES   += QTOPIA_DLL
-        DESTDIR         = $(QPEDIR)/bin
+        DESTDIR         = $(OPIEDIR)/bin
        HEADERS         += server.h \
                  serverinterface.h \
                  launchertab.h \
                  documentlist.h \
-                  suspendmonitor.h \
                  appicons.h \
                  taskbar.h \
                  runningappbar.h \
@@ -21,39 +19,41 @@ HEADERS		+= server.h \
                  shutdownimpl.h \
                  launcher.h \
                  launcherview.h \
-                  $(QPEDIR)/src/settings/calibrate/calibrate.h \
+                  $(OPIEDIR)/core/apps/calibrate/calibrate.h \
                  startmenu.h \
                  transferserver.h \
                  qcopbridge.h \
                  packageslave.h \
                  irserver.h \
                  firstuse.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/buf.h \
+        $(OPIEDIR)/rsync/buf.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/checksum.h \
+        $(OPIEDIR)/rsync/checksum.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/command.h \
+        $(OPIEDIR)/rsync/command.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/emit.h \
+        $(OPIEDIR)/rsync/emit.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/job.h \
+        $(OPIEDIR)/rsync/job.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \
+        $(OPIEDIR)/rsync/netint.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \
+        $(OPIEDIR)/rsync/protocol.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/prototab.h \
+        $(OPIEDIR)/rsync/prototab.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \
+        $(OPIEDIR)/rsync/rsync.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/search.h \
+        $(OPIEDIR)/rsync/search.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \
+        $(OPIEDIR)/rsync/stream.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \
+        $(OPIEDIR)/rsync/sumset.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \
+        $(OPIEDIR)/rsync/trace.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/types.h \
+        $(OPIEDIR)/rsync/types.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/util.h \
+        $(OPIEDIR)/rsync/util.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/whole.h \
+        $(OPIEDIR)/rsync/whole.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \
+        $(OPIEDIR)/rsync/config_rsync.h \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.h \
+        $(OPIEDIR)/rsync/qrsync.h \
                  syncdialog.h \
-                  serverapp.h
+                  serverapp.h \
+                  launcherglobal.h \
+                  qprocess.h \
+                  screensaver.h
        SOURCES         += server.cpp \
                  serverinterface.cpp \
                  launchertab.cpp \
                  documentlist.cpp \
-                  suspendmonitor.cpp \
                  appicons.cpp \
                  taskbar.cpp \
                  runningappbar.cpp \
@@ -65,7 +65,7 @@ SOURCES		+= server.cpp \
                  shutdownimpl.cpp \
                  launcher.cpp \
                  launcherview.cpp \
-                  $(QPEDIR)/src/settings/calibrate/calibrate.cpp \
+                  $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
                  transferserver.cpp \
                  packageslave.cpp \
                  irserver.cpp \
@@ -73,46 +73,48 @@ SOURCES		+= server.cpp \
                  startmenu.cpp \
                  main.cpp \
                  firstuse.cpp \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/base64.c \
+        $(OPIEDIR)/rsync/base64.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/buf.c \
+        $(OPIEDIR)/rsync/buf.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/checksum.c \
+        $(OPIEDIR)/rsync/checksum.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/command.c \
+        $(OPIEDIR)/rsync/command.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/delta.c \
+        $(OPIEDIR)/rsync/delta.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/emit.c \
+        $(OPIEDIR)/rsync/emit.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/hex.c \
+        $(OPIEDIR)/rsync/hex.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/job.c \
+        $(OPIEDIR)/rsync/job.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/mdfour.c \
+        $(OPIEDIR)/rsync/mdfour.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/mksum.c \
+        $(OPIEDIR)/rsync/mksum.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/msg.c \
+        $(OPIEDIR)/rsync/msg.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/netint.c \
+        $(OPIEDIR)/rsync/netint.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/patch.c \
+        $(OPIEDIR)/rsync/patch.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/prototab.c \
+        $(OPIEDIR)/rsync/prototab.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/readsums.c \
+        $(OPIEDIR)/rsync/readsums.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/scoop.c \
+        $(OPIEDIR)/rsync/scoop.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/search.c \
+        $(OPIEDIR)/rsync/search.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/stats.c \
+        $(OPIEDIR)/rsync/stats.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/stream.c \
+        $(OPIEDIR)/rsync/stream.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/sumset.c \
+        $(OPIEDIR)/rsync/sumset.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/trace.c \
+        $(OPIEDIR)/rsync/trace.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/tube.c \
+        $(OPIEDIR)/rsync/tube.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/util.c \
+        $(OPIEDIR)/rsync/util.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/version.c \
+        $(OPIEDIR)/rsync/version.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/whole.c \
+        $(OPIEDIR)/rsync/whole.c \
-        $(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.cpp \
+        $(OPIEDIR)/rsync/qrsync.cpp \
                  syncdialog.cpp \
-                  serverapp.cpp
+                  serverapp.cpp \
+                  launcherglobal.cpp \
+                  qprocess.cpp \
+                  qprocess_unix.cpp \
+                  screensaver.cpp
-        INTERFACES+= shutdown.ui
-INCLUDEPATH += $(QPEDIR)/src/settings/calibrate
+INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
-        DEPENDPATH+= $(QPEDIR)/src/settings/calibrate
+        DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate
-INCLUDEPATH += $(QPEDIR)/src/3rdparty/libraries/rsync
+INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
-        DEPENDPATH+= $(QPEDIR)/src/3rdparty/libraries/rsync
+        DEPENDPATH+= $(OPIEDIR)/rsync
        TARGET  = qpe
-        unix:LIBS+= -lcrypt -luuid
+        LIBS+= -lcrypt -lqpe -lopie
-win32:LIBS      += 
-TRANSLATIONS = qpe-en_GB.ts qpe-de.ts qpe-ja.ts qpe-no.ts
+include ( $(OPIEDIR)/include.pro )
+\ No newline at end of file

diff --git a/core/launcher/server.pro b/core/launcher/server.pro index 0fc6dae..8e379d3 100644 --- a/core/launcher/server.pro +++ b/core/launcher/server.pro
@@ -1,15 +1,13 @@
1	TEMPLATE= app	1	TEMPLATE= app
2		2
3	CONFIG += qtopia warn_on release	3	CONFIG += qtopia warn_on release
4	win32:DEFINES += QTOPIA_DLL
5		4
6	DESTDIR = $(QPEDIR)/bin	5	DESTDIR = $(OPIEDIR)/bin
7		6
8	HEADERS += server.h \	7	HEADERS += server.h \
9	serverinterface.h \	8	serverinterface.h \
10	launchertab.h \	9	launchertab.h \
11	documentlist.h \	10	documentlist.h \
12	suspendmonitor.h \
13	appicons.h \	11	appicons.h \
14	taskbar.h \	12	taskbar.h \
15	runningappbar.h \	13	runningappbar.h \
@@ -21,39 +19,41 @@ HEADERS += server.h \
21	shutdownimpl.h \	19	shutdownimpl.h \
22	launcher.h \	20	launcher.h \
23	launcherview.h \	21	launcherview.h \
24	$(QPEDIR)/src/settings/calibrate/calibrate.h \	22	$(OPIEDIR)/core/apps/calibrate/calibrate.h \
25	startmenu.h \	23	startmenu.h \
26	transferserver.h \	24	transferserver.h \
27	qcopbridge.h \	25	qcopbridge.h \
28	packageslave.h \	26	packageslave.h \
29	irserver.h \	27	irserver.h \
30	firstuse.h \	28	firstuse.h \
31	$(QPEDIR)/src/3rdparty/libraries/rsync/buf.h \	29	$(OPIEDIR)/rsync/buf.h \
32	$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.h \	30	$(OPIEDIR)/rsync/checksum.h \
33	$(QPEDIR)/src/3rdparty/libraries/rsync/command.h \	31	$(OPIEDIR)/rsync/command.h \
34	$(QPEDIR)/src/3rdparty/libraries/rsync/emit.h \	32	$(OPIEDIR)/rsync/emit.h \
35	$(QPEDIR)/src/3rdparty/libraries/rsync/job.h \	33	$(OPIEDIR)/rsync/job.h \
36	$(QPEDIR)/src/3rdparty/libraries/rsync/netint.h \	34	$(OPIEDIR)/rsync/netint.h \
37	$(QPEDIR)/src/3rdparty/libraries/rsync/protocol.h \	35	$(OPIEDIR)/rsync/protocol.h \
38	$(QPEDIR)/src/3rdparty/libraries/rsync/prototab.h \	36	$(OPIEDIR)/rsync/prototab.h \
39	$(QPEDIR)/src/3rdparty/libraries/rsync/rsync.h \	37	$(OPIEDIR)/rsync/rsync.h \
40	$(QPEDIR)/src/3rdparty/libraries/rsync/search.h \	38	$(OPIEDIR)/rsync/search.h \
41	$(QPEDIR)/src/3rdparty/libraries/rsync/stream.h \	39	$(OPIEDIR)/rsync/stream.h \
42	$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.h \	40	$(OPIEDIR)/rsync/sumset.h \
43	$(QPEDIR)/src/3rdparty/libraries/rsync/trace.h \	41	$(OPIEDIR)/rsync/trace.h \
44	$(QPEDIR)/src/3rdparty/libraries/rsync/types.h \	42	$(OPIEDIR)/rsync/types.h \
45	$(QPEDIR)/src/3rdparty/libraries/rsync/util.h \	43	$(OPIEDIR)/rsync/util.h \
46	$(QPEDIR)/src/3rdparty/libraries/rsync/whole.h \	44	$(OPIEDIR)/rsync/whole.h \
47	$(QPEDIR)/src/3rdparty/libraries/rsync/config_rsync.h \	45	$(OPIEDIR)/rsync/config_rsync.h \
48	$(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.h \	46	$(OPIEDIR)/rsync/qrsync.h \
49	syncdialog.h \	47	syncdialog.h \
50	serverapp.h	48	serverapp.h \
		49	launcherglobal.h \
		50	qprocess.h \
		51	screensaver.h
51		52
52	SOURCES += server.cpp \	53	SOURCES += server.cpp \
53	serverinterface.cpp \	54	serverinterface.cpp \
54	launchertab.cpp \	55	launchertab.cpp \
55	documentlist.cpp \	56	documentlist.cpp \
56	suspendmonitor.cpp \
57	appicons.cpp \	57	appicons.cpp \
58	taskbar.cpp \	58	taskbar.cpp \
59	runningappbar.cpp \	59	runningappbar.cpp \
@@ -65,7 +65,7 @@ SOURCES += server.cpp \
65	shutdownimpl.cpp \	65	shutdownimpl.cpp \
66	launcher.cpp \	66	launcher.cpp \
67	launcherview.cpp \	67	launcherview.cpp \
68	$(QPEDIR)/src/settings/calibrate/calibrate.cpp \	68	$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
69	transferserver.cpp \	69	transferserver.cpp \
70	packageslave.cpp \	70	packageslave.cpp \
71	irserver.cpp \	71	irserver.cpp \
@@ -73,46 +73,48 @@ SOURCES += server.cpp \
73	startmenu.cpp \	73	startmenu.cpp \
74	main.cpp \	74	main.cpp \
75	firstuse.cpp \	75	firstuse.cpp \
76	$(QPEDIR)/src/3rdparty/libraries/rsync/base64.c \	76	$(OPIEDIR)/rsync/base64.c \
77	$(QPEDIR)/src/3rdparty/libraries/rsync/buf.c \	77	$(OPIEDIR)/rsync/buf.c \
78	$(QPEDIR)/src/3rdparty/libraries/rsync/checksum.c \	78	$(OPIEDIR)/rsync/checksum.c \
79	$(QPEDIR)/src/3rdparty/libraries/rsync/command.c \	79	$(OPIEDIR)/rsync/command.c \
80	$(QPEDIR)/src/3rdparty/libraries/rsync/delta.c \	80	$(OPIEDIR)/rsync/delta.c \
81	$(QPEDIR)/src/3rdparty/libraries/rsync/emit.c \	81	$(OPIEDIR)/rsync/emit.c \
82	$(QPEDIR)/src/3rdparty/libraries/rsync/hex.c \	82	$(OPIEDIR)/rsync/hex.c \
83	$(QPEDIR)/src/3rdparty/libraries/rsync/job.c \	83	$(OPIEDIR)/rsync/job.c \
84	$(QPEDIR)/src/3rdparty/libraries/rsync/mdfour.c \	84	$(OPIEDIR)/rsync/mdfour.c \
85	$(QPEDIR)/src/3rdparty/libraries/rsync/mksum.c \	85	$(OPIEDIR)/rsync/mksum.c \
86	$(QPEDIR)/src/3rdparty/libraries/rsync/msg.c \	86	$(OPIEDIR)/rsync/msg.c \
87	$(QPEDIR)/src/3rdparty/libraries/rsync/netint.c \	87	$(OPIEDIR)/rsync/netint.c \
88	$(QPEDIR)/src/3rdparty/libraries/rsync/patch.c \	88	$(OPIEDIR)/rsync/patch.c \
89	$(QPEDIR)/src/3rdparty/libraries/rsync/prototab.c \	89	$(OPIEDIR)/rsync/prototab.c \
90	$(QPEDIR)/src/3rdparty/libraries/rsync/readsums.c \	90	$(OPIEDIR)/rsync/readsums.c \
91	$(QPEDIR)/src/3rdparty/libraries/rsync/scoop.c \	91	$(OPIEDIR)/rsync/scoop.c \
92	$(QPEDIR)/src/3rdparty/libraries/rsync/search.c \	92	$(OPIEDIR)/rsync/search.c \
93	$(QPEDIR)/src/3rdparty/libraries/rsync/stats.c \	93	$(OPIEDIR)/rsync/stats.c \
94	$(QPEDIR)/src/3rdparty/libraries/rsync/stream.c \	94	$(OPIEDIR)/rsync/stream.c \
95	$(QPEDIR)/src/3rdparty/libraries/rsync/sumset.c \	95	$(OPIEDIR)/rsync/sumset.c \
96	$(QPEDIR)/src/3rdparty/libraries/rsync/trace.c \	96	$(OPIEDIR)/rsync/trace.c \
97	$(QPEDIR)/src/3rdparty/libraries/rsync/tube.c \	97	$(OPIEDIR)/rsync/tube.c \
98	$(QPEDIR)/src/3rdparty/libraries/rsync/util.c \	98	$(OPIEDIR)/rsync/util.c \
99	$(QPEDIR)/src/3rdparty/libraries/rsync/version.c \	99	$(OPIEDIR)/rsync/version.c \
100	$(QPEDIR)/src/3rdparty/libraries/rsync/whole.c \	100	$(OPIEDIR)/rsync/whole.c \
101	$(QPEDIR)/src/3rdparty/libraries/rsync/qrsync.cpp \	101	$(OPIEDIR)/rsync/qrsync.cpp \
102	syncdialog.cpp \	102	syncdialog.cpp \
103	serverapp.cpp	103	serverapp.cpp \
		104	launcherglobal.cpp \
		105	qprocess.cpp \
		106	qprocess_unix.cpp \
		107	screensaver.cpp
104		108
105	INTERFACES+= shutdown.ui
106		109
107	INCLUDEPATH += $(QPEDIR)/src/settings/calibrate	110	INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
108	DEPENDPATH+= $(QPEDIR)/src/settings/calibrate	111	DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate
109		112
110	INCLUDEPATH += $(QPEDIR)/src/3rdparty/libraries/rsync	113	INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
111	DEPENDPATH+= $(QPEDIR)/src/3rdparty/libraries/rsync	114	DEPENDPATH+= $(OPIEDIR)/rsync
112		115
113	TARGET = qpe	116	TARGET = qpe
114		117
115	unix:LIBS+= -lcrypt -luuid	118	LIBS+= -lcrypt -lqpe -lopie
116	win32:LIBS +=
117		119
118	TRANSLATIONS = qpe-en_GB.ts qpe-de.ts qpe-ja.ts qpe-no.ts	120	include ( $(OPIEDIR)/include.pro ) \ No newline at end of file