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
@@ -171,17 +171,17 @@ menu "Base"
default LIBQPE
source library/config.in
source x11/config.in
endchoice
source libopie/config.in
source libopie2/config.in
source libqtaux/config.in
-
+ source rsync/config.in
source core/opie-login/config.in
source core/opiealarm/config.in
source core/tools/quicklauncher/config.in
source core/launcher/config.in
source core/symlinker/config.in
endmenu
comment ""
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
@@ -21,34 +21,16 @@ HEADERS += server.h \
launcherview.h \
$$(OPIEDIR)/core/apps/calibrate/calibrate.h \
startmenu.h \
transferserver.h \
qcopbridge.h \
packageslave.h \
irserver.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 \
serverapp.h \
qprocess.h \
screensaver.h \
$$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
mediadlg.h
SOURCES += server.cpp \
@@ -69,42 +51,16 @@ SOURCES += server.cpp \
$$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
transferserver.cpp \
packageslave.cpp \
irserver.cpp \
qcopbridge.cpp \
startmenu.cpp \
main.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 \
serverapp.cpp \
qprocess.cpp \
qprocess_unix.cpp \
screensaver.cpp \
$$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
mediadlg.cpp
@@ -113,16 +69,16 @@ INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
DEPENDPATH += $(OPIEDIR)/core/apps/calibrate
INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
DEPENDPATH += $(OPIEDIR)/rsync
INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
-LIBS += -lqpe -lopiecore2 -lopieui2
+LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync
TARGET = qpe
contains( $(CONFIG_TARGET_MACOSX), y ) {
LIBS += -lcrypt
}
include ( $(OPIEDIR)/include.pro )
diff --git a/packages b/packages
index 8214bdf..690cbdb 100644
--- a/packages
+++ b/packages
@@ -86,16 +86,17 @@ CONFIG_LIBOPIE2NET libopie2/opienet opienet.pro
CONFIG_LIBOPIE2PIM libopie2/opiepim opiepim.pro
CONFIG_PIMCONVERTER noncore/tools/pimconverter converter.pro
CONFIG_LIBOPIE2UI libopie2/opieui opieui.pro
CONFIG_LIBOPIE libopie libopie.pro
CONFIG_LIBOPIE_PIM libopie/pim pim.pro
CONFIG_LIBOPIETOOTH noncore/net/opietooth/lib lib.pro
CONFIG_LIBQPE library library.pro
CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro
+CONFIG_LIBQRSYNC rsync rsync.pro
CONFIG_LIBQTAUX libqtaux libqtaux.pro
CONFIG_LIBSLCOMPAT libslcompat libslcompat.pro
CONFIG_LIBSQL libsql libsql.pro
CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
CONFIG_LIGHT-AND-POWER core/settings/light-and-power light-and-power.pro
CONFIG_LIQUID noncore/styles/liquid liquid.pro
CONFIG_LOGOUTAPPLET core/applets/logoutapplet logoutapplet.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 )