summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-28 21:18:02 (UTC)
committer mickeyl <mickeyl>2004-04-28 21:18:02 (UTC)
commitf567351ae81391fbe50c8f37a6dc2ff661b23f44 (patch) (unidiff)
treea588d11e7a5b310c485c7a6a4aa6d773200deda3
parentf498387e7c58cd9488c9b4ed964bfb0ebeead5c8 (diff)
downloadopie-f567351ae81391fbe50c8f37a6dc2ff661b23f44.zip
opie-f567351ae81391fbe50c8f37a6dc2ff661b23f44.tar.gz
opie-f567351ae81391fbe50c8f37a6dc2ff661b23f44.tar.bz2
CLEANUP: rsync is now a (static) library and the launcher links against it
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--config.in2
-rw-r--r--core/launcher/server.pro46
-rw-r--r--packages1
-rw-r--r--rsync/config.in3
-rw-r--r--rsync/rsync.pro60
5 files changed, 66 insertions, 46 deletions
diff --git a/config.in b/config.in
index 2e9c90e..5c23904 100644
--- a/config.in
+++ b/config.in
@@ -175,9 +175,9 @@ menu "Base"
175 source libopie/config.in 175 source libopie/config.in
176 176
177 source libopie2/config.in 177 source libopie2/config.in
178 source libqtaux/config.in 178 source libqtaux/config.in
179 179 source rsync/config.in
180 source core/opie-login/config.in 180 source core/opie-login/config.in
181 source core/opiealarm/config.in 181 source core/opiealarm/config.in
182 source core/tools/quicklauncher/config.in 182 source core/tools/quicklauncher/config.in
183 source core/launcher/config.in 183 source core/launcher/config.in
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 25806b6..4e6a581 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -25,26 +25,8 @@ HEADERS += server.h \
25 qcopbridge.h \ 25 qcopbridge.h \
26 packageslave.h \ 26 packageslave.h \
27 irserver.h \ 27 irserver.h \
28 firstuse.h \ 28 firstuse.h \
29 $$(OPIEDIR)/rsync/buf.h \
30 $$(OPIEDIR)/rsync/checksum.h \
31 $$(OPIEDIR)/rsync/command.h \
32 $$(OPIEDIR)/rsync/emit.h \
33 $$(OPIEDIR)/rsync/job.h \
34 $$(OPIEDIR)/rsync/netint.h \
35 $$(OPIEDIR)/rsync/protocol.h \
36 $$(OPIEDIR)/rsync/prototab.h \
37 $$(OPIEDIR)/rsync/rsync.h \
38 $$(OPIEDIR)/rsync/search.h \
39 $$(OPIEDIR)/rsync/stream.h \
40 $$(OPIEDIR)/rsync/sumset.h \
41 $$(OPIEDIR)/rsync/trace.h \
42 $$(OPIEDIR)/rsync/types.h \
43 $$(OPIEDIR)/rsync/util.h \
44 $$(OPIEDIR)/rsync/whole.h \
45 $$(OPIEDIR)/rsync/config_rsync.h \
46 $$(OPIEDIR)/rsync/qrsync.h \
47 syncdialog.h \ 29 syncdialog.h \
48 serverapp.h \ 30 serverapp.h \
49 qprocess.h \ 31 qprocess.h \
50 screensaver.h \ 32 screensaver.h \
@@ -73,34 +55,8 @@ SOURCES += server.cpp \
73 qcopbridge.cpp \ 55 qcopbridge.cpp \
74 startmenu.cpp \ 56 startmenu.cpp \
75 main.cpp \ 57 main.cpp \
76 firstuse.cpp \ 58 firstuse.cpp \
77 $$(OPIEDIR)/rsync/base64.c \
78 $$(OPIEDIR)/rsync/buf.c \
79 $$(OPIEDIR)/rsync/checksum.c \
80 $$(OPIEDIR)/rsync/command.c \
81 $$(OPIEDIR)/rsync/delta.c \
82 $$(OPIEDIR)/rsync/emit.c \
83 $$(OPIEDIR)/rsync/hex.c \
84 $$(OPIEDIR)/rsync/job.c \
85 $$(OPIEDIR)/rsync/mdfour.c \
86 $$(OPIEDIR)/rsync/mksum.c \
87 $$(OPIEDIR)/rsync/msg.c \
88 $$(OPIEDIR)/rsync/netint.c \
89 $$(OPIEDIR)/rsync/patch.c \
90 $$(OPIEDIR)/rsync/prototab.c \
91 $$(OPIEDIR)/rsync/readsums.c \
92 $$(OPIEDIR)/rsync/scoop.c \
93 $$(OPIEDIR)/rsync/search.c \
94 $$(OPIEDIR)/rsync/stats.c \
95 $$(OPIEDIR)/rsync/stream.c \
96 $$(OPIEDIR)/rsync/sumset.c \
97 $$(OPIEDIR)/rsync/trace.c \
98 $$(OPIEDIR)/rsync/tube.c \
99 $$(OPIEDIR)/rsync/util.c \
100 $$(OPIEDIR)/rsync/version.c \
101 $$(OPIEDIR)/rsync/whole.c \
102 $$(OPIEDIR)/rsync/qrsync.cpp \
103 syncdialog.cpp \ 59 syncdialog.cpp \
104 serverapp.cpp \ 60 serverapp.cpp \
105 qprocess.cpp \ 61 qprocess.cpp \
106 qprocess_unix.cpp \ 62 qprocess_unix.cpp \
@@ -117,9 +73,9 @@ DEPENDPATH += $(OPIEDIR)/rsync
117 73
118INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount 74INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
119DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount 75DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
120 76
121LIBS += -lqpe -lopiecore2 -lopieui2 77LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync
122TARGET = qpe 78TARGET = qpe
123 79
124contains( $(CONFIG_TARGET_MACOSX), y ) { 80contains( $(CONFIG_TARGET_MACOSX), y ) {
125 LIBS += -lcrypt 81 LIBS += -lcrypt
diff --git a/packages b/packages
index 8214bdf..690cbdb 100644
--- a/packages
+++ b/packages
@@ -90,8 +90,9 @@ CONFIG_LIBOPIE libopie libopie.pro
90 CONFIG_LIBOPIE_PIM libopie/pimpim.pro 90 CONFIG_LIBOPIE_PIM libopie/pimpim.pro
91 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro 91 CONFIG_LIBOPIETOOTH noncore/net/opietooth/liblib.pro
92 CONFIG_LIBQPE librarylibrary.pro 92 CONFIG_LIBQPE librarylibrary.pro
93 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro 93 CONFIG_LIBQPE-X11 x11/libqpe-x11libqpe-x11.pro
94CONFIG_LIBQRSYNC rsync rsync.pro
94 CONFIG_LIBQTAUX libqtauxlibqtaux.pro 95 CONFIG_LIBQTAUX libqtauxlibqtaux.pro
95 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro 96 CONFIG_LIBSLCOMPAT libslcompatlibslcompat.pro
96 CONFIG_LIBSQL libsqllibsql.pro 97 CONFIG_LIBSQL libsqllibsql.pro
97CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro 98CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
diff --git a/rsync/config.in b/rsync/config.in
new file mode 100644
index 0000000..d9502e4
--- a/dev/null
+++ b/rsync/config.in
@@ -0,0 +1,3 @@
1 config LIBQRSYNC
2 boolean "qt rsync wrapper library"
3 default "y"
diff --git a/rsync/rsync.pro b/rsync/rsync.pro
new file mode 100644
index 0000000..a02d122
--- a/dev/null
+++ b/rsync/rsync.pro
@@ -0,0 +1,60 @@
1 TEMPLATE= lib
2
3 CONFIG += qt staticlib warn_on
4
5 DESTDIR = $$(OPIEDIR)/lib
6
7 HEADERS += \
8 buf.h \
9 checksum.h \
10 command.h \
11 emit.h \
12 job.h \
13 netint.h \
14 protocol.h \
15 prototab.h \
16 rsync.h \
17 search.h \
18 stream.h \
19 sumset.h \
20 trace.h \
21 types.h \
22 util.h \
23 whole.h \
24 config_rsync.h \
25 qrsync.h
26
27 SOURCES += \
28 base64.c \
29 buf.c \
30 checksum.c \
31 command.c \
32 delta.c \
33 emit.c \
34 hex.c \
35 job.c \
36 mdfour.c \
37 mksum.c \
38 msg.c \
39 netint.c \
40 patch.c \
41 prototab.c \
42 readsums.c \
43 scoop.c \
44 search.c \
45 stats.c \
46 stream.c \
47 sumset.c \
48 trace.c \
49 tube.c \
50 util.c \
51 version.c \
52 whole.c \
53 qrsync.cpp
54
55INCLUDEPATH += $(OPIEDIR)/include
56
57LIBS += -lopiecore2
58TARGET = qrsync
59
60include ( $(OPIEDIR)/include.pro )