X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=c5523fb4d42aea980b643efe842565e284fe3511;hb=d4dcc66ebcafe23296e291c806296cf58c48910a;hp=84a620176c496f71066049e062f80a963be87aa4;hpb=4f21735dc06d089624fa82400d6e19fce220dd14;p=vncterm.git

diff --git a/Makefile b/Makefile
index 84a6201..c5523fb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.0
+RELEASE=4.0
 
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
-VERSION=1.1
+VERSION=1.2
 PACKAGERELEASE=1
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
@@ -13,16 +13,18 @@ VNCSRC=${VNCDIR}.tar.gz
 VNCLIB=${VNCDIR}/libvncserver/.libs/libvncserver.a
 
 TIGERVNCSRC=tigervnc-1.1.0.tgz
+#TIGERVNCSRC=tigervnc-1.2.0.tgz
 
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
 
-KEYSTORE=/home/dietmar/pve2-proxdev/proxmox-dev/proxmox-java.keystore
+KEYSTORE=/home/dietmar/pve2-proxdev/proxmox-dev/comodo-for-java.keystore
 
 all: vncterm
 
 glyphs.h: genfont
-	./genfont > glyphs.h
+	./genfont > glyphs.h.tmp
+	mv glyphs.h.tmp glyphs.h
 
 genfont: genfont.c
 	gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
@@ -37,21 +39,27 @@ ${VNCLIB} vnc: ${VNCSRC}
 	cd ${VNCDIR}; make
 
 vncterm: vncterm.c glyphs.h ${VNCLIB}
-	gcc -O2 -g -o $@ vncterm.c -Wall -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls
+	gcc -O2 -g -o $@ vncterm.c -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls
 
 jar: tigervnc.org
+	if test ! -f /usr/share/icedtea-web/plugin.jar; then echo "please install package icedtea-netx-common"; exit 1; fi
 	rm -rf tigervnc VncViewer.jar
 	rsync -av --exclude .svn --exclude .svnignore  tigervnc.org/ tigervnc
 	ln -s ../tigerpatches tigervnc/patches
 	cd tigervnc; quilt push -a
 	cd tigervnc/java/src/com/tigervnc/vncviewer; make clean; make
-	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.jar proxmox
+	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/src/com/tigervnc/vncviewer/VncViewer.jar "dc475d72-124a-11e4-a53f-005056c00008"
+
+# this is for version 1.2
+#	ln -s ../newtigerpatches tigervnc/patches
+#	cd tigervnc/java;cmake -G "Unix Makefiles"; make
+#	jarsigner -keystore ${KEYSTORE} -signedjar VncViewer.jar  tigervnc/java/VncViewer.jar proxmox
 
 tigervnc.org: ${TIGERVNCSRC}
 	rm -rf tigervnc.org
 	tar xf ${TIGERVNCSRC}
 
-downlaod:
+download:
 	rm -rf tigervnc.org
 	svn co https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/tags/1_1_0 tigervnc.org 
 	tar cf ${TIGERVNCSRC} tigervnc.org
@@ -105,7 +113,7 @@ upload: ${DEB}
 
 .PHONY: clean
 clean:
-	rm -rf vncterm vncterm.1 vncterm_*.deb tigervnc *~ ${VNCDIR} vncterm-*.tar.gz
+	rm -rf vncterm vncterm.1 vncterm_*.deb tigervnc *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp
 
 .PHONY: distclean
 distclean: clean
@@ -119,4 +127,4 @@ ${SNAP} dist: distclean
 
 .PHONY: uploaddist
 uploaddist: ${SNAP}
-	scp ${SNAP} pve.proxmox.com:/home/ftp/sources/
\ No newline at end of file
+	scp ${SNAP} pve.proxmox.com:/home/ftp/sources/