[med-svn] r11546 - trunk/packages/conquest-dicom-server/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2012-07-04 16:32:21 +0000 (Wed, 04 Jul 2012)
New Revision: 11546

Modified:
   trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source
   trunk/packages/conquest-dicom-server/trunk/debian/rules
Log:
Use conv copy of jasper

Modified: trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source	2012-07-04 16:20:43 UTC (rev 11545)
+++ trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source	2012-07-04 16:32:21 UTC (rev 11546)
@@ -16,7 +16,7 @@
 
 # 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

Modified: trunk/packages/conquest-dicom-server/trunk/debian/rules
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-04 16:20:43 UTC (rev 11545)
+++ trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-04 16:32:21 UTC (rev 11546)
@@ -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