PACKAGE=vncterm
# Note: also change version in debian/control and debian/changelog
-VERSION=1.4
-PACKAGERELEASE=1
+VERSION=1.5
+PACKAGERELEASE=3
ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+GITVERSION:=$(shell cat .git/refs/heads/master)
CDATE:=$(shell date +%F)
VNCVER=0.9.11
DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
+CPPFLAGS += -O2 -g -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I $(VNCDIR)
+
+VNC_LIBS := -lnsl -lpthread -lz -ljpeg -lutil -lgnutls -lpng
+
all: vncterm
-glyphs.h: genfont
- ./genfont > glyphs.h.tmp
- mv glyphs.h.tmp glyphs.h
+font.data: genfont2
+ ./genfont2 -o font.data.tmp -i /usr/share/unifont/unifont.hex
+ mv font.data.tmp font.data
-genfont: genfont.c
- gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
+genfont2: genfont2.c
+ gcc -g -O2 -o $@ genfont2.c -Wall -Wextra -D_GNU_SOURCE -lz
.PHONY: vnc
-${VNCLIB} vnc: ${VNCSRC}
+vnc: ${VNCLIB}
+${VNCLIB}: ${VNCSRC}
rm -rf ${VNCDIR}
tar xf ${VNCSRC}
ln -s ../vncpatches ${VNCDIR}/patches
cd ${VNCDIR}; quilt push -a
cd ${VNCDIR}; ./autogen.sh --without-ssl --without-websockets --without-tightvnc-filetransfer;
- cd ${VNCDIR}; make
+ 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 -lpng
+vncterm: vncterm.c wchardata.c $(VNCLIB)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(VNC_LIBS)
+wchardata.c:
+ cp /usr/share/unifont/$@ $@
.PHONY: install
-install: vncterm vncterm.1
+install: vncterm vncterm.1 font.data
mkdir -p ${DESTDIR}/usr/share/doc/${PACKAGE}
+ install -m 0644 copyright ${DESTDIR}/usr/share/doc/${PACKAGE}
+ mkdir -p ${DESTDIR}/usr/share/${PACKAGE}
+ install -m 0644 font.data ${DESTDIR}/usr/share/${PACKAGE}
mkdir -p ${DESTDIR}/usr/share/man/man1
+ install -m 0644 vncterm.1 ${DESTDIR}/usr/share/man/man1
mkdir -p ${DESTDIR}/usr/bin
install -s -m 0755 vncterm ${DESTDIR}/usr/bin
.PHONY: deb
deb: $(DEB)
${DEB}:
- make clean
- rm -rf dest
- mkdir dest
- make DESTDIR=`pwd`/dest install
- install -d -m 0755 dest/DEBIAN
- install -m 0644 debian/control dest/DEBIAN
- echo "Architecture: ${ARCH}" >>dest/DEBIAN/control
- install -m 0644 debian/conffiles dest/DEBIAN
- install -m 0644 copyright dest/usr/share/doc/${PACKAGE}
- install -m 0644 vncterm.1 dest/usr/share/man/man1
- install -m 0644 debian/changelog.Debian dest/usr/share/doc/${PACKAGE}
- gzip -n --best dest/usr/share/man/*/*
- gzip -n --best dest/usr/share/doc/${PACKAGE}/changelog.Debian
- fakeroot dpkg-deb --build dest
- mv dest.deb ${DEB}
- rm -rf dest
+ $(MAKE) clean
+ rsync -a . --exclude build build
+ echo "Architecture: ${ARCH}" >> build/debian/control
+ echo "git clone git://git.proxmox.com/git/vncterm.git\\ngit checkout ${GIVERSION}" > build/debian/SOURCE
+ cd build; dpkg-buildpackage -rfakeroot -b -us -uc
lintian ${DEB}
.PHONY: upload
.PHONY: clean
clean:
- rm -rf vncterm vncterm.1 vncterm_*.deb genfont *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp
+ rm -rf vncterm vncterm.1 vncterm_*.deb genfont genfont2 *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp build *.changes wchardata.c font.data.tmp font.data *.buildinfo
.PHONY: distclean
distclean: clean