aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/opie-taskbar/opie-taskbar/server-pro-cvs.patch
blob: 30dda636b8390f2d44b6da0c175214a0db977ef2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
--- launcher/server.pro
+++ launcher/server.pro
@@ -2,7 +2,7 @@ TEMPLATE	= app
 
 CONFIG		+= qt warn_on 
 
-DESTDIR		= $$(OPIEDIR)/bin
+DESTDIR		=
 
 HEADERS		+= server.h \
 		  qrr.h \
@@ -20,7 +20,7 @@ HEADERS		+= server.h \
 		  shutdownimpl.h \
 		  launcher.h \
 		  launcherview.h \
-		  $$(OPIEDIR)/core/apps/calibrate/calibrate.h \
+		  calibrate/calibrate.h \
 		  startmenu.h \
 		  transferserver.h \
 		  qcopbridge.h \
@@ -31,7 +31,7 @@ HEADERS		+= server.h \
 		  serverapp.h \
 		  qprocess.h \
 		  screensaver.h \
-		  $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
+		  mediummount/mediumwidget.h \
                   mediadlg.h \
 		  virtualfs.h \
           syncaccessmanager.h
@@ -52,7 +52,7 @@ SOURCES		+= server.cpp \
 		  shutdownimpl.cpp \
 		  launcher.cpp \
 		  launcherview.cpp \
-		  $$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
+		  calibrate/calibrate.cpp \
 		  transferserver.cpp \
 		  packageslave.cpp \
    		  irserver.cpp \
@@ -65,22 +65,22 @@ SOURCES		+= server.cpp \
 		  qprocess.cpp \
 		  qprocess_unix.cpp \
 		  screensaver.cpp \
-		  $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
+		  mediummount/mediumwidget.cc \
                   mediadlg.cpp \
 		  virtualfs.cpp \
           syncaccessmanager.cpp
 
 
-INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
-DEPENDPATH	+= $(OPIEDIR)/core/apps/calibrate
+INCLUDEPATH += calibrate
+DEPENDPATH	+= calibrate
 
-INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
-DEPENDPATH	+= $(OPIEDIR)/rsync
+INCLUDEPATH += $(OPIEDIR)/include rsync
+DEPENDPATH	+= rsync
 
-INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
-DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
+INCLUDEPATH += mediummount
+DEPENDPATH  += mediummount
 
-LIBS        += -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
+LIBS         = -lqpe -lopiecore2 -lopieui2 -lopiesecurity2 -lqrsync
 TARGET       = qpe
 
 ## not ready for use yet