[Pkg-voip-commits] [ring] 03/05: Working rules file

[Alexandre Viau]

This is an automated email from the git hooks/post-receive script.

aviau pushed a commit to branch master
in repository ring.

commit a7cf1ef3022796d2b70448e9d6092451f0a67bca
Author: aviau <alexandre at alexandreviau.net>
Date:   Fri Mar 4 14:25:52 2016 -0500

    Working rules file
---
 debian/control |  7 ------
 debian/rules   | 72 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/debian/control b/debian/control
index 9139901..1e1f1bc 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,9 @@ Build-Depends: debhelper (>= 9),
                autoconf,
                automake,
                cmake,
-               astyle,
-               check,
                libtool,
 # gnome client
                libdbus-1-dev,
-               libpcre3-dev,
-               libyaml-cpp-dev,
-               libboost-dev,
                libdbus-c++-dev,
                libupnp-dev,
                libgnutls28-dev,
@@ -32,7 +27,6 @@ Build-Depends: debhelper (>= 9),
                unbound-anchor,
                git-core,
                autotools-dev,
-               chrpath,
                gnome-icon-theme-symbolic,
                gettext,
 # ring-daemon
@@ -52,7 +46,6 @@ Build-Depends: debhelper (>= 9),
                yasm,
                autopoint,
                unbound-anchor,
-               git-core,
                libspeex-dev,
                libspeexdsp-dev,
                autotools-dev,
diff --git a/debian/rules b/debian/rules
index 39643b5..3ddf20f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,34 +10,80 @@ override_dh_auto_configure:
 	#################
 	mkdir -p daemon/contrib/native
 	cd daemon/contrib/native && \
-        ../bootstrap --disable-ogg --disable-flac --disable-vorbis --disable-vorbisenc --disable-speex --disable-sndfile --disable-speexdsp && \
-        make list && \
-        make -j 2
-	@echo "Contribs built"
+        ../bootstrap \
+				--disable-ogg \
+				--disable-flac \
+				--disable-vorbis \
+				--disable-vorbisenc \
+				--disable-speex \
+				--disable-sndfile \
+				--disable-speexdsp && \
+		make -j4
 	cd daemon && \
-		./autogen.sh &&
+		./autogen.sh && \
 		./configure --prefix=/usr
 
-	dh_auto_configure
+	###################
+	## libringclient ##
+	###################
+	cd lrc && \
+		mkdir build && \
+		cd build && \
+		cmake  \
+			-DRING_BUILD_DIR=$(CURDIR)/daemon/src \
+			-DCMAKE_INSTALL_PREFIX=/usr \
+			-DENABLE_VIDEO=true \
+			-DENABLE_STATIC=true \
+			..
+
+	##################
+	## gnome client ##
+	##################
+	cd client-gnome && \
+		mkdir build && \
+		cd build && \
+		cmake \
+			-DCMAKE_INSTALL_PREFIX=/usr \
+			-DLibRingClient_DIR=$(CURDIR)/lrc/src \
+			..
 
+	dh_auto_configure
 
 override_dh_auto_build:
 	#################
 	## Ring Daemon ##
 	#################
-	cd daemon &&
-		make -j2
+	cd daemon && make -j4
+
+	###################
+	## libringclient ##
+	###################
+	cd lrc/build && make -j4
+
+	##################
+	## gnome client ##
+	##################
+	cd client-gnome/build && make LDFLAGS="-lpthread" -j4
 
 override_dh_auto_clean:
-	[ -d daemon/contrib/native ] && cd daemon/contrib/native && $(MAKE) distclean
+	#[ -d daemon/contrib/native ] && cd daemon/contrib/native && $(MAKE) distclean
 	rm -rf daemon/contrib/native
 
 override_dh_auto_install:
 	#################
 	## Ring Daemon ##
 	#################
-	cd daemon &&
-		make DESTDIR=$(CURDIR)/debian/ring-daemon install
+	cd daemon && make DESTDIR=$(CURDIR)/debian/ring install
 	# TODO include or not a and la file
-	find $(CURDIR)/debian/ring-daemon/ -name libring.a -delete
-	find $(CURDIR)/debian/ring-daemon/ -name libring.la -delete
+	#find $(CURDIR)/debian/ring/ -name libring.a -delete
+	#find $(CURDIR)/debian/ring/ -name libring.la -delete
+
+	###################
+	## libringclient ##
+	###################
+	cd lrc/build && make DESTDIR=$(CURDIR)/debian/ring install
+
+	##################
+	## gnome client ##
+	##################
+	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/ring install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/ring.git