summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2002-08-31 13:31:44 (UTC)
committer cniehaus <cniehaus>2002-08-31 13:31:44 (UTC)
commitd9881e0b7441bca58ae186573e2e824c2dbcd0fa (patch) (unidiff)
tree98e3a046bb91547a975c5f9b6595d2d29ef5d4b7
parentef7af5b4df29a47cb557eed348022dd7be5cbe29 (diff)
downloadopie-d9881e0b7441bca58ae186573e2e824c2dbcd0fa.zip
opie-d9881e0b7441bca58ae186573e2e824c2dbcd0fa.tar.gz
opie-d9881e0b7441bca58ae186573e2e824c2dbcd0fa.tar.bz2
please review. I did :%s/\(OPIEDIR)/..\/../
Index: launcher.pro =================================================================== RCS file: /usr/cvs/opie/core/launcher/launcher.pro,v retrieving revision 1.21 diff -u -3 -p -r1.21 launcher.pro --- launcher.pro 29 Aug 2002 15:24:36 -0000 1.21 +++ launcher.pro 31 Aug 2002 13:30:04 -0000 @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(OPIEDIR)/bin +DESTDIR = ../../bin HEADERS = background.h \ desktop.h \ qprocess.h \ @@ -17,30 +17,30 @@ HEADERS = background.h \ shutdownimpl.h \ launcher.h \ launcherview.h \ - $(OPIEDIR)/core/apps/calibrate/calibrate.h \ + ../../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 \ - $(OPIEDIR)/rsync/prototab.h \ - $(OPIEDIR)/rsync/rsync.h \ - $(OPIEDIR)/rsync/search.h \ - $(OPIEDIR)/rsync/stream.h \ - $(OPIEDIR)/rsync/sumset.h \ - $(OPIEDIR)/rsync/trace.h \ - $(OPIEDIR)/rsync/types.h \ - $(OPIEDIR)/rsync/util.h \ - $(OPIEDIR)/rsync/whole.h \ - $(OPIEDIR)/rsync/config_rsync.h \ - $(OPIEDIR)/rsync/qrsync.h + ../../rsync/buf.h \ + ../../rsync/checksum.h \ + ../../rsync/command.h \ + ../../rsync/emit.h \ + ../../rsync/job.h \ + ../../rsync/netint.h \ + ../../rsync/protocol.h \ + ../../rsync/prototab.h \ + ../../rsync/rsync.h \ + ../../rsync/search.h \ + ../../rsync/stream.h \ + ../../rsync/sumset.h \ + ../../rsync/trace.h \ + ../../rsync/types.h \ + ../../rsync/util.h \ + ../../rsync/whole.h \ + ../../rsync/config_rsync.h \ + ../../rsync/qrsync.h # quicklauncher.h \ SOURCES = background.cpp \ desktop.cpp \ @@ -58,46 +58,46 @@ SOURCES = background.cpp \ shutdownimpl.cpp \ launcher.cpp \ launcherview.cpp \ - $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ + ../../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 \ - $(OPIEDIR)/rsync/hex.c \ - $(OPIEDIR)/rsync/job.c \ - $(OPIEDIR)/rsync/mdfour.c \ - $(OPIEDIR)/rsync/mksum.c \ - $(OPIEDIR)/rsync/msg.c \ - $(OPIEDIR)/rsync/netint.c \ - $(OPIEDIR)/rsync/patch.c \ - $(OPIEDIR)/rsync/prototab.c \ - $(OPIEDIR)/rsync/readsums.c \ - $(OPIEDIR)/rsync/scoop.c \ - $(OPIEDIR)/rsync/search.c \ - $(OPIEDIR)/rsync/stats.c \ - $(OPIEDIR)/rsync/stream.c \ - $(OPIEDIR)/rsync/sumset.c \ - $(OPIEDIR)/rsync/trace.c \ - $(OPIEDIR)/rsync/tube.c \ - $(OPIEDIR)/rsync/util.c \ - $(OPIEDIR)/rsync/version.c \ - $(OPIEDIR)/rsync/whole.c \ - $(OPIEDIR)/rsync/qrsync.cpp + ../../rsync/base64.c \ + ../../rsync/buf.c \ + ../../rsync/checksum.c \ + ../../rsync/command.c \ + ../../rsync/delta.c \ + ../../rsync/emit.c \ + ../../rsync/hex.c \ + ../../rsync/job.c \ + ../../rsync/mdfour.c \ + ../../rsync/mksum.c \ + ../../rsync/msg.c \ + ../../rsync/netint.c \ + ../../rsync/patch.c \ + ../../rsync/prototab.c \ + ../../rsync/readsums.c \ + ../../rsync/scoop.c \ + ../../rsync/search.c \ + ../../rsync/stats.c \ + ../../rsync/stream.c \ + ../../rsync/sumset.c \ + ../../rsync/trace.c \ + ../../rsync/tube.c \ + ../../rsync/util.c \ + ../../rsync/version.c \ + ../../rsync/whole.c \ + ../../rsync/qrsync.cpp INTERFACES = syncdialog.ui -INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += $(OPIEDIR)/include . -INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate -DEPENDPATH += $(OPIEDIR)/core/apps/calibrate -INCLUDEPATH += $(OPIEDIR)/rsync -DEPENDPATH += $(OPIEDIR)/rsync +INCLUDEPATH += ../../include +DEPENDPATH += ../../include . +INCLUDEPATH += ../../core/apps/calibrate +DEPENDPATH += ../../core/apps/calibrate +INCLUDEPATH += ../../rsync +DEPENDPATH += ../../rsync TARGET = qpe LIBS += -lqpe -lcrypt -lopie -luuid
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.pro106
1 files changed, 53 insertions, 53 deletions
diff --git a/core/launcher/launcher.pro b/core/launcher/launcher.pro
index 3b75008..bae5c51 100644
--- a/core/launcher/launcher.pro
+++ b/core/launcher/launcher.pro
@@ -1,5 +1,5 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG = qt warn_on release 2 CONFIG = qt warn_on release
3 DESTDIR = $(OPIEDIR)/bin 3 DESTDIR = ../../bin
4 HEADERS = background.h \ 4 HEADERS = background.h \
5 desktop.h \ 5 desktop.h \
@@ -18,5 +18,5 @@ HEADERS = background.h \
18 launcher.h \ 18 launcher.h \
19 launcherview.h \ 19 launcherview.h \
20 $(OPIEDIR)/core/apps/calibrate/calibrate.h \ 20 ../../core/apps/calibrate/calibrate.h \
21 startmenu.h \ 21 startmenu.h \
22 transferserver.h \ 22 transferserver.h \
@@ -24,22 +24,22 @@ HEADERS = background.h \
24 packageslave.h \ 24 packageslave.h \
25 irserver.h \ 25 irserver.h \
26 $(OPIEDIR)/rsync/buf.h \ 26 ../../rsync/buf.h \
27 $(OPIEDIR)/rsync/checksum.h \ 27 ../../rsync/checksum.h \
28 $(OPIEDIR)/rsync/command.h \ 28 ../../rsync/command.h \
29 $(OPIEDIR)/rsync/emit.h \ 29 ../../rsync/emit.h \
30 $(OPIEDIR)/rsync/job.h \ 30 ../../rsync/job.h \
31 $(OPIEDIR)/rsync/netint.h \ 31 ../../rsync/netint.h \
32 $(OPIEDIR)/rsync/protocol.h \ 32 ../../rsync/protocol.h \
33 $(OPIEDIR)/rsync/prototab.h \ 33 ../../rsync/prototab.h \
34 $(OPIEDIR)/rsync/rsync.h \ 34 ../../rsync/rsync.h \
35 $(OPIEDIR)/rsync/search.h \ 35 ../../rsync/search.h \
36 $(OPIEDIR)/rsync/stream.h \ 36 ../../rsync/stream.h \
37 $(OPIEDIR)/rsync/sumset.h \ 37 ../../rsync/sumset.h \
38 $(OPIEDIR)/rsync/trace.h \ 38 ../../rsync/trace.h \
39 $(OPIEDIR)/rsync/types.h \ 39 ../../rsync/types.h \
40 $(OPIEDIR)/rsync/util.h \ 40 ../../rsync/util.h \
41 $(OPIEDIR)/rsync/whole.h \ 41 ../../rsync/whole.h \
42 $(OPIEDIR)/rsync/config_rsync.h \ 42 ../../rsync/config_rsync.h \
43 $(OPIEDIR)/rsync/qrsync.h 43 ../../rsync/qrsync.h
44 # quicklauncher.h \ 44 # quicklauncher.h \
45 SOURCES = background.cpp \ 45 SOURCES = background.cpp \
@@ -59,5 +59,5 @@ SOURCES = background.cpp \
59 launcher.cpp \ 59 launcher.cpp \
60 launcherview.cpp \ 60 launcherview.cpp \
61 $(OPIEDIR)/core/apps/calibrate/calibrate.cpp \ 61 ../../core/apps/calibrate/calibrate.cpp \
62 transferserver.cpp \ 62 transferserver.cpp \
63 packageslave.cpp \ 63 packageslave.cpp \
@@ -66,37 +66,37 @@ SOURCES = background.cpp \
66 startmenu.cpp \ 66 startmenu.cpp \
67 main.cpp \ 67 main.cpp \
68 $(OPIEDIR)/rsync/base64.c \ 68 ../../rsync/base64.c \
69 $(OPIEDIR)/rsync/buf.c \ 69 ../../rsync/buf.c \
70 $(OPIEDIR)/rsync/checksum.c \ 70 ../../rsync/checksum.c \
71 $(OPIEDIR)/rsync/command.c \ 71 ../../rsync/command.c \
72 $(OPIEDIR)/rsync/delta.c \ 72 ../../rsync/delta.c \
73 $(OPIEDIR)/rsync/emit.c \ 73 ../../rsync/emit.c \
74 $(OPIEDIR)/rsync/hex.c \ 74 ../../rsync/hex.c \
75 $(OPIEDIR)/rsync/job.c \ 75 ../../rsync/job.c \
76 $(OPIEDIR)/rsync/mdfour.c \ 76 ../../rsync/mdfour.c \
77 $(OPIEDIR)/rsync/mksum.c \ 77 ../../rsync/mksum.c \
78 $(OPIEDIR)/rsync/msg.c \ 78 ../../rsync/msg.c \
79 $(OPIEDIR)/rsync/netint.c \ 79 ../../rsync/netint.c \
80 $(OPIEDIR)/rsync/patch.c \ 80 ../../rsync/patch.c \
81 $(OPIEDIR)/rsync/prototab.c \ 81 ../../rsync/prototab.c \
82 $(OPIEDIR)/rsync/readsums.c \ 82 ../../rsync/readsums.c \
83 $(OPIEDIR)/rsync/scoop.c \ 83 ../../rsync/scoop.c \
84 $(OPIEDIR)/rsync/search.c \ 84 ../../rsync/search.c \
85 $(OPIEDIR)/rsync/stats.c \ 85 ../../rsync/stats.c \
86 $(OPIEDIR)/rsync/stream.c \ 86 ../../rsync/stream.c \
87 $(OPIEDIR)/rsync/sumset.c \ 87 ../../rsync/sumset.c \
88 $(OPIEDIR)/rsync/trace.c \ 88 ../../rsync/trace.c \
89 $(OPIEDIR)/rsync/tube.c \ 89 ../../rsync/tube.c \
90 $(OPIEDIR)/rsync/util.c \ 90 ../../rsync/util.c \
91 $(OPIEDIR)/rsync/version.c \ 91 ../../rsync/version.c \
92 $(OPIEDIR)/rsync/whole.c \ 92 ../../rsync/whole.c \
93 $(OPIEDIR)/rsync/qrsync.cpp 93 ../../rsync/qrsync.cpp
94 INTERFACES= syncdialog.ui 94 INTERFACES= syncdialog.ui
95INCLUDEPATH += $(OPIEDIR)/include 95INCLUDEPATH += ../../include
96 DEPENDPATH+= $(OPIEDIR)/include . 96 DEPENDPATH+= ../../include .
97INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate 97INCLUDEPATH += ../../core/apps/calibrate
98 DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate 98 DEPENDPATH+= ../../core/apps/calibrate
99INCLUDEPATH += $(OPIEDIR)/rsync 99INCLUDEPATH += ../../rsync
100 DEPENDPATH+= $(OPIEDIR)/rsync 100 DEPENDPATH+= ../../rsync
101 TARGET = qpe 101 TARGET = qpe
102 LIBS += -lqpe -lcrypt -lopie -luuid 102 LIBS += -lqpe -lcrypt -lopie -luuid