summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-28 21:18:02 (UTC)
committer mickeyl <mickeyl>2004-04-28 21:18:02 (UTC)
commitf567351ae81391fbe50c8f37a6dc2ff661b23f44 (patch) (side-by-side diff)
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
@@ -178,3 +178,3 @@ menu "Base"
source libqtaux/config.in
-
+ source rsync/config.in
source core/opie-login/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
@@ -28,20 +28,2 @@ HEADERS += server.h \
firstuse.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 \
syncdialog.h \
@@ -76,28 +58,2 @@ SOURCES += server.cpp \
firstuse.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 \
syncdialog.cpp \
@@ -120,3 +76,3 @@ DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
-LIBS += -lqpe -lopiecore2 -lopieui2
+LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync
TARGET = qpe
diff --git a/packages b/packages
index 8214bdf..690cbdb 100644
--- a/packages
+++ b/packages
@@ -93,2 +93,3 @@ CONFIG_LIBQPE library library.pro
CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro
+CONFIG_LIBQRSYNC rsync rsync.pro
CONFIG_LIBQTAUX libqtaux libqtaux.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 @@
+ config LIBQRSYNC
+ boolean "qt rsync wrapper library"
+ 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 @@
+TEMPLATE = lib
+
+CONFIG += qt staticlib warn_on
+
+DESTDIR = $$(OPIEDIR)/lib
+
+HEADERS += \
+ buf.h \
+ checksum.h \
+ command.h \
+ emit.h \
+ job.h \
+ netint.h \
+ protocol.h \
+ prototab.h \
+ rsync.h \
+ search.h \
+ stream.h \
+ sumset.h \
+ trace.h \
+ types.h \
+ util.h \
+ whole.h \
+ config_rsync.h \
+ qrsync.h
+
+SOURCES += \
+ base64.c \
+ buf.c \
+ checksum.c \
+ command.c \
+ delta.c \
+ emit.c \
+ hex.c \
+ job.c \
+ mdfour.c \
+ mksum.c \
+ msg.c \
+ netint.c \
+ patch.c \
+ prototab.c \
+ readsums.c \
+ scoop.c \
+ search.c \
+ stats.c \
+ stream.c \
+ sumset.c \
+ trace.c \
+ tube.c \
+ util.c \
+ version.c \
+ whole.c \
+ qrsync.cpp
+
+INCLUDEPATH += $(OPIEDIR)/include
+
+LIBS += -lopiecore2
+TARGET = qrsync
+
+include ( $(OPIEDIR)/include.pro )