bump version to 3.0-1

[spiceterm.git] / Makefile

diff --git a/Makefile b/Makefile
index 0c3b16b6e0451d4706b1b12f9d88c9822f92df5e..da97af3352afd543d6fe08965cfdb58a23e9bf9e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.1
+RELEASE=5.0
 
 PACKAGE=spiceterm
-VERSION=1.0
-PACKAGERELEASE=2
+VERSION=3.0
+PACKAGERELEASE=1
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
@@ -14,13 +14,17 @@ PROGRAMS=spiceterm
 HEADERS=translations.h event_loop.h glyphs.h spiceterm.h keysyms.h
 SOURCES=screen.c event_loop.c input.c spiceterm.c auth-pve.c
 
+PKGS := glib-2.0 spice-protocol spice-server libsasl2
+CFLAGS += `pkg-config --cflags $(PKGS)`
+LIBS += `pkg-config --libs $(PKGS)`
+
 #export G_MESSAGES_DEBUG=all 
 #export SPICE_DEBUG=1
 
 all: ${PROGRAMS}
 
 spiceterm: ${SOURCES} ${HEADERS} spiceterm.c 
-       gcc -Werror -Wall -Wtype-limits ${SOURCES} -g -O2 -o $@ -lutil $(shell pkg-config) $(shell pkg-config --cflags --libs gthread-2.0,spice-protocol,spice-server)
+       gcc -Werror -Wall -Wl,-z,relro -Wtype-limits ${SOURCES} -g -O2 $(CFLAGS) -o $@ -lutil $(LIBS)
 
 genfont: genfont.c
        gcc -g -O2 -o $@ genfont.c -Wall -D_GNU_SOURCE -lz
@@ -46,7 +50,8 @@ install: spiceterm spiceterm.1
        install -s -m 0755 spiceterm ${DESTDIR}/usr/bin
 
 .PHONY: deb
-${DEB} deb:
+deb: ${DEB}
+${DEB}:
        make clean
        rsync -a . --exclude build build
        echo "git clone git://git.proxmox.com/git/spiceterm.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
@@ -60,13 +65,7 @@ dinstall: ${DEB}
 
 .PHONY: upload
 upload: ${DEB}
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-       mkdir -p /pve/${RELEASE}/extra
-       rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-       rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEB} /pve/${RELEASE}/extra
-       cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+       tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH}
 
 .PHONY: test
 test: spiceterm