X-Git-Url: https://git.proxmox.com/?p=vncterm.git;a=blobdiff_plain;f=Makefile;h=2318f0945e28b98f940ccd798fba8199a7774d8e;hp=8b37c66da5c5906ba493acf0bf2df534502e9dbc;hb=55533e250ef83ec8442f82c148d69ec269fbc1c0;hpb=ebe1002c3d877aae90628636c7c7dc79e5f86653

diff --git a/Makefile b/Makefile
index 8b37c66..2318f09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
-VERSION=1.4
-PACKAGERELEASE=2
+VERSION=1.5
+PACKAGERELEASE=3
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 CDATE:=$(shell date +%F)
@@ -15,14 +15,11 @@ VNCLIB=${VNCDIR}/libvncserver/.libs/libvncserver.a
 DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 SNAP=${PACKAGE}-${VERSION}-${CDATE}.tar.gz
 
-all: vncterm
+CPPFLAGS += -O2 -g -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I $(VNCDIR)
 
-glyphs.h: genfont
-	./genfont > glyphs.h.tmp
-	mv glyphs.h.tmp glyphs.h
+VNC_LIBS := -lnsl -lpthread -lz -ljpeg -lutil -lgnutls -lpng
 
-genfont: genfont.c
-	gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
+all: vncterm
 
 font.data: genfont2
 	./genfont2 -o font.data.tmp -i /usr/share/unifont/unifont.hex
@@ -32,22 +29,27 @@ 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
@@ -64,7 +66,7 @@ vncterm.1: vncterm.pod
 .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
@@ -77,7 +79,7 @@ upload: ${DEB}
 
 .PHONY: clean
 clean:
-	rm -rf vncterm vncterm.1 vncterm_*.deb genfont genfont2 *~ ${VNCDIR} vncterm-*.tar.gz glyph.h.tmp build *.changes font.data.tmp font.data
+	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