CLEANUP: rsync is now a (static) library and the launcher links against it

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"
   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
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 \
 		  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 \
@@ -73,34 +55,8 @@ SOURCES		+= server.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 \
@@ -117,9 +73,9 @@ 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
diff --git a/packages b/packages
index 8214bdf..690cbdb 100644
--- a/packages
+++ b/packages
@@ -90,8 +90,9 @@ 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
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 )