[med-svn] [conquest-dicom-server] 04/30: Use conv copy of jasper

[Pablo Lorenzzoni]

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

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit a6237c3dbf946869229e814e4248f1fbaa601b54
Author: Mathieu Malaterre <malat at debian.org>
Date:   Wed Jul 4 16:32:21 2012 +0000

    Use conv copy of jasper
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-med/trunk/packages/conquest-dicom-server/trunk@11546 d8681a01-af0d-0410-a158-b4166a59cfaa
---
 debian/get-orig-source | 2 +-
 debian/rules           | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/get-orig-source b/debian/get-orig-source
index 2b8de99..ebc3465 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -16,7 +16,7 @@ tar xvf ${UPSTREAM} -C ${FOLDER}
 
 # cleanup
 # conv copy of libjasper (sigh)
-rm -rf ${FOLDER}/jasper-1.900.1-6ct/
+#rm -rf ${FOLDER}/jasper-1.900.1-6ct/
 # conv copy of libjpeg 6c:
 #rm -rf ${FOLDER}/jpeg-6c/
 # conv copy of lua 5.1.4
diff --git a/debian/rules b/debian/rules
index b4c4adc..28ffddb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,18 @@
 %:
 	dh $@ --parallel
 
+jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a:
+	cd jasper-1.900.1-6ct
+	./configure --disable-libjpeg
+	make
+
 jpeg-6c/libjpeg.a:
 	cd jpeg-6c/
 	./configure
 	make
 
-dgate: jpeg-6c/libjpeg.a
-	g++ $(CPPFLAGS) $(CXXFLAGS) -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -ldl -ljasper -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a -Wno-multichar $(LDFLAGS)
+dgate: jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a
+	g++ $(CPPFLAGS) $(CXXFLAGS) -Ijasper-1.900.1-6ct/src/libjasper/include -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -ldl -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a -Wno-multichar $(LDFLAGS)
 
 override_dh_auto_build: dgate
 	cp dicom.ini.sqlite dicom.ini

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git