X-Git-Url: https://git.proxmox.com/?p=vncterm.git;a=blobdiff_plain;f=Makefile;h=4f275a2e04bf2d2e359b0f0cf19b467dc0930502;hp=792b5bdab77453f7851fb1adec7999428b1aa8cb;hb=ed0731ffaab8bfd009995bd55550de25140b7649;hpb=b5ae868d1de9443d67765084e904ac0f6c192d81

diff --git a/Makefile b/Makefile
index 792b5bd..4f275a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk
+
 PACKAGE=vncterm
-# Note: also change version in debian/control and debian/changelog
-VERSION=1.4
-PACKAGERELEASE=2
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
-CDATE:=$(shell date +%F)
 
 VNCVER=0.9.11
 VNCREL=LibVNCServer-${VNCVER}
@@ -12,35 +10,43 @@ VNCDIR=libvncserver-${VNCREL}
 VNCSRC=${VNCREL}.tar.gz
 VNCLIB=${VNCDIR}/libvncserver/.libs/libvncserver.a
 
-DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
-SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+
+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
@@ -52,17 +58,16 @@ dinstall: ${DEB}
 
 vncterm.1: vncterm.pod
 	rm -f $@
-	pod2man -n $< -s 1 -r ${VERSION} <$< >$@
+	pod2man -n $< -s 1 -r ${DEB_VERSION_UPSTREAM} <$< >$@
 
 .PHONY: deb
 deb: $(DEB)
 ${DEB}:
-	make clean
+	$(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}	
+	lintian ${DEB}
 
 .PHONY: upload
 upload: ${DEB}
@@ -70,17 +75,7 @@ upload: ${DEB}
 
 .PHONY: clean
 clean:
-	rm -rf vncterm vncterm.1 vncterm_*.deb genfont *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp build *.changes
+	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
-
-.PHONY: dist
-${SNAP} dist: distclean
-	rm -rf ../${SNAP}
-	cd ..; tar cvzf ${SNAP} --exclude .svn ${PACKAGE}
-	mv ../${SNAP} ${SNAP}
-
-.PHONY: uploaddist
-uploaddist: ${SNAP}
-	scp ${SNAP} pve.proxmox.com:/home/ftp/sources/