[pve-devel] [PATCH spiceterm] buildsystem fixups

Wolfgang Bumiller w.bumiller at proxmox.com
Tue Jan 31 11:15:21 CET 2017


---
The gcc command part is there for clarity, it makes more sense to find
these parts as variables.
The build dependencies are there because pkg-config as used there just
prints a not-that-easy-to-spot error message.

 Makefile       | 9 +++++++--
 debian/control | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 654729a..7215560 100644
--- a/Makefile
+++ b/Makefile
@@ -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 gthread-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 -Wl,-z,relro -Wtype-limits ${SOURCES} -g -O2 -o $@ -lutil $(shell pkg-config) $(shell pkg-config --cflags --libs gthread-2.0,spice-protocol,spice-server,libsasl2)
+	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
diff --git a/debian/control b/debian/control
index fd9a833..f1e79a9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: spiceterm
 Section: admin
 Priority: extra
 Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), libglib2.0-dev, libsasl2-dev, libspice-protocol-dev, pve-libspice-server-dev
 Standards-Version: 3.9.3
 
 Package: spiceterm
-- 
2.11.0




More information about the pve-devel mailing list