build: update options for libvncserver 0.9.11

[vncterm.git] / Makefile

diff --git a/Makefile b/Makefile
index abb85a68b6e19b05a86c74c33f86b49a990a5e73..6318f5710af86791dbd6e88ef2f6a584b817a030 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,10 @@ PACKAGERELEASE=1
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 CDATE:=$(shell date +%F)
 
-VNCVER=0.9.7
-VNCDIR=LibVNCServer-${VNCVER}
-VNCSRC=${VNCDIR}.tar.gz
+VNCVER=0.9.11
+VNCREL=LibVNCServer-${VNCVER}
+VNCDIR=libvncserver-${VNCREL}
+VNCSRC=${VNCREL}.tar.gz
 VNCLIB=${VNCDIR}/libvncserver/.libs/libvncserver.a
 
 TIGERVNCSRC=tigervnc-1.1.0.tgz
@@ -23,7 +24,8 @@ 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
@@ -34,11 +36,11 @@ ${VNCLIB} vnc: ${VNCSRC}
        tar xf ${VNCSRC}
        ln -s ../vncpatches ${VNCDIR}/patches
        cd ${VNCDIR}; quilt push -a
-       cd ${VNCDIR}; ./configure; 
+       cd ${VNCDIR}; ./autogen.sh --without-ssl --without-websockets --without-tightvnc-filetransfer;
        cd ${VNCDIR}; make
 
 vncterm: vncterm.c glyphs.h ${VNCLIB}
-       gcc -O2 -g -o $@ vncterm.c -Wall -Wno-deprecated-declarations -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 -lpng
 
 jar: tigervnc.org
        if test ! -f /usr/share/icedtea-web/plugin.jar; then echo "please install package icedtea-netx-common"; exit 1; fi
@@ -112,7 +114,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