1 files changed, 4 insertions, 4 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index b8e9236..182cd1f 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -11,25 +11,25 @@ HEADERS		= background.h \
                  info.h \
                  appicons.h \
                  taskbar.h \
                  sidething.h \
                  mrulist.h \
                  stabmon.h \
                  inputmethods.h \
                  systray.h \
                  wait.h \
                  shutdownimpl.h \
                  launcher.h \
                  launcherview.h \
-                  ../calibrate/calibrate.h \
+                  $(OPIEDIR)/core/apps/calibrate/calibrate.h \
                  startmenu.h \
                  transferserver.h \
                  qcopbridge.h \
                  packageslave.h \
                irserver.h \
        $(OPIEDIR)/rsync/buf.h \
        $(OPIEDIR)/rsync/checksum.h \
        $(OPIEDIR)/rsync/command.h \
        $(OPIEDIR)/rsync/emit.h \
        $(OPIEDIR)/rsync/job.h \
        $(OPIEDIR)/rsync/netint.h \
        $(OPIEDIR)/rsync/protocol.h \
@@ -53,25 +53,25 @@ SOURCES		= background.cpp \
                  info.cpp \
                  appicons.cpp \
                  taskbar.cpp \
                  sidething.cpp \
                  mrulist.cpp \
                  stabmon.cpp \
                  inputmethods.cpp \
                  systray.cpp \
                  wait.cpp \
                  shutdownimpl.cpp \
                  launcher.cpp \
                  launcherview.cpp \
-                  $(OPIEDIR)/calibrate/calibrate.cpp \
+                  $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
                  transferserver.cpp \
                  packageslave.cpp \
                irserver.cpp \
                  qcopbridge.cpp \
                  startmenu.cpp \
                  main.cpp \
        $(OPIEDIR)/rsync/base64.c \
        $(OPIEDIR)/rsync/buf.c \
        $(OPIEDIR)/rsync/checksum.c \
        $(OPIEDIR)/rsync/command.c \
        $(OPIEDIR)/rsync/delta.c \
        $(OPIEDIR)/rsync/emit.c \
@@ -92,26 +92,26 @@ SOURCES		= background.cpp \
        $(OPIEDIR)/rsync/trace.c \
        $(OPIEDIR)/rsync/tube.c \
        $(OPIEDIR)/rsync/util.c \
        $(OPIEDIR)/rsync/version.c \
        $(OPIEDIR)/rsync/whole.c \
        $(OPIEDIR)/rsync/qrsync.cpp
        INTERFACES= shutdown.ui syncdialog.ui
 INCLUDEPATH += $(OPIEDIR)/include
        DEPENDPATH+= $(OPIEDIR)/include .
-INCLUDEPATH += $(OPIEDIR)/calibrate
+INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
-        DEPENDPATH+= $(OPIEDIR)/calibrate
+        DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate
 INCLUDEPATH += $(OPIEDIR)/rsync
        DEPENDPATH+= $(OPIEDIR)/rsync
        TARGET  = qpe
        LIBS    += -lqpe -lcrypt -lopie
 TRANSLATIONS = ../i18n/de/qpe.ts
 TRANSLATIONS += ../i18n/es/qpe.ts
 TRANSLATIONS += ../i18n/pt/qpe.ts
 TRANSLATIONS += ../i18n/pt_BR/qpe.ts

diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro index b8e9236..182cd1f 100644 --- a/core/launcher/launcher.pro +++ b/core/launcher/launcher.pro
@@ -11,25 +11,25 @@ HEADERS = background.h \
11	info.h \	11	info.h \
12	appicons.h \	12	appicons.h \
13	taskbar.h \	13	taskbar.h \
14	sidething.h \	14	sidething.h \
15	mrulist.h \	15	mrulist.h \
16	stabmon.h \	16	stabmon.h \
17	inputmethods.h \	17	inputmethods.h \
18	systray.h \	18	systray.h \
19	wait.h \	19	wait.h \
20	shutdownimpl.h \	20	shutdownimpl.h \
21	launcher.h \	21	launcher.h \
22	launcherview.h \	22	launcherview.h \
23	../calibrate/calibrate.h \	23	$(OPIEDIR)/core/apps/calibrate/calibrate.h \
24	startmenu.h \	24	startmenu.h \
25	transferserver.h \	25	transferserver.h \
26	qcopbridge.h \	26	qcopbridge.h \
27	packageslave.h \	27	packageslave.h \
28	irserver.h \	28	irserver.h \
29	$(OPIEDIR)/rsync/buf.h \	29	$(OPIEDIR)/rsync/buf.h \
30	$(OPIEDIR)/rsync/checksum.h \	30	$(OPIEDIR)/rsync/checksum.h \
31	$(OPIEDIR)/rsync/command.h \	31	$(OPIEDIR)/rsync/command.h \
32	$(OPIEDIR)/rsync/emit.h \	32	$(OPIEDIR)/rsync/emit.h \
33	$(OPIEDIR)/rsync/job.h \	33	$(OPIEDIR)/rsync/job.h \
34	$(OPIEDIR)/rsync/netint.h \	34	$(OPIEDIR)/rsync/netint.h \
35	$(OPIEDIR)/rsync/protocol.h \	35	$(OPIEDIR)/rsync/protocol.h \
@@ -53,25 +53,25 @@ SOURCES = background.cpp \
53	info.cpp \	53	info.cpp \
54	appicons.cpp \	54	appicons.cpp \
55	taskbar.cpp \	55	taskbar.cpp \
56	sidething.cpp \	56	sidething.cpp \
57	mrulist.cpp \	57	mrulist.cpp \
58	stabmon.cpp \	58	stabmon.cpp \
59	inputmethods.cpp \	59	inputmethods.cpp \
60	systray.cpp \	60	systray.cpp \
61	wait.cpp \	61	wait.cpp \
62	shutdownimpl.cpp \	62	shutdownimpl.cpp \
63	launcher.cpp \	63	launcher.cpp \
64	launcherview.cpp \	64	launcherview.cpp \
65	$(OPIEDIR)/calibrate/calibrate.cpp \	65	$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
66	transferserver.cpp \	66	transferserver.cpp \
67	packageslave.cpp \	67	packageslave.cpp \
68	irserver.cpp \	68	irserver.cpp \
69	qcopbridge.cpp \	69	qcopbridge.cpp \
70	startmenu.cpp \	70	startmenu.cpp \
71	main.cpp \	71	main.cpp \
72	$(OPIEDIR)/rsync/base64.c \	72	$(OPIEDIR)/rsync/base64.c \
73	$(OPIEDIR)/rsync/buf.c \	73	$(OPIEDIR)/rsync/buf.c \
74	$(OPIEDIR)/rsync/checksum.c \	74	$(OPIEDIR)/rsync/checksum.c \
75	$(OPIEDIR)/rsync/command.c \	75	$(OPIEDIR)/rsync/command.c \
76	$(OPIEDIR)/rsync/delta.c \	76	$(OPIEDIR)/rsync/delta.c \
77	$(OPIEDIR)/rsync/emit.c \	77	$(OPIEDIR)/rsync/emit.c \
@@ -92,26 +92,26 @@ SOURCES = background.cpp \
92	$(OPIEDIR)/rsync/trace.c \	92	$(OPIEDIR)/rsync/trace.c \
93	$(OPIEDIR)/rsync/tube.c \	93	$(OPIEDIR)/rsync/tube.c \
94	$(OPIEDIR)/rsync/util.c \	94	$(OPIEDIR)/rsync/util.c \
95	$(OPIEDIR)/rsync/version.c \	95	$(OPIEDIR)/rsync/version.c \
96	$(OPIEDIR)/rsync/whole.c \	96	$(OPIEDIR)/rsync/whole.c \
97	$(OPIEDIR)/rsync/qrsync.cpp	97	$(OPIEDIR)/rsync/qrsync.cpp
98		98
99	INTERFACES= shutdown.ui syncdialog.ui	99	INTERFACES= shutdown.ui syncdialog.ui
100		100
101	INCLUDEPATH += $(OPIEDIR)/include	101	INCLUDEPATH += $(OPIEDIR)/include
102	DEPENDPATH+= $(OPIEDIR)/include .	102	DEPENDPATH+= $(OPIEDIR)/include .
103		103
104	INCLUDEPATH += $(OPIEDIR)/calibrate	104	INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
105	DEPENDPATH+= $(OPIEDIR)/calibrate	105	DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate
106		106
107	INCLUDEPATH += $(OPIEDIR)/rsync	107	INCLUDEPATH += $(OPIEDIR)/rsync
108	DEPENDPATH+= $(OPIEDIR)/rsync	108	DEPENDPATH+= $(OPIEDIR)/rsync
109		109
110	TARGET = qpe	110	TARGET = qpe
111		111
112	LIBS += -lqpe -lcrypt -lopie	112	LIBS += -lqpe -lcrypt -lopie
113		113
114	TRANSLATIONS = ../i18n/de/qpe.ts	114	TRANSLATIONS = ../i18n/de/qpe.ts
115	TRANSLATIONS += ../i18n/es/qpe.ts	115	TRANSLATIONS += ../i18n/es/qpe.ts
116	TRANSLATIONS += ../i18n/pt/qpe.ts	116	TRANSLATIONS += ../i18n/pt/qpe.ts
117	TRANSLATIONS += ../i18n/pt_BR/qpe.ts	117	TRANSLATIONS += ../i18n/pt_BR/qpe.ts