buildsystem fixups

diff --git a/Makefile b/Makefile
index 143b19e8ad666c0197054232026e9b6c0a85f1aa..9b97e9ce23d66337840330af24576b0bddd7297e 100644 (file)
--- 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

diff --git a/debian/control b/debian/control
index fd9a8336e2c5971f43dcb1da867f546bb61dae4d..f1e79a9b969ce9f26cf5d162e6c9420e3a94a7fb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: spiceterm
 Section: admin
 Priority: extra
 Maintainer: Proxmox Support Team <support@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