X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=blobdiff_plain;f=Makefile;h=369e66077bf360de86149aa47876a89ff5eb3262;hp=3ea2243e574b0bb3a7f07fb79191fc8b86677905;hb=24466eb53d8d227c977788dd40f14fea2898a4c9;hpb=cf7b2c9e3609e5a99fab0b0fe4364a135c927a94 diff --git a/Makefile b/Makefile index 3ea2243..369e660 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,10 @@ VERSION=5.0 PACKAGE=qemu-server -PKGREL=24 +PKGREL=46 -CFLAGS= -O2 -Werror -Wall -Wtype-limits -Wl,-z,relro +CFLAGS+=-O2 -Werror -Wall -Wextra -Wpedantic -Wtype-limits -Wl,-z,relro -std=gnu11 +JSON_CFLAGS=$(shell pkg-config --cflags json-c) +JSON_LIBS=$(shell pkg-config --libs json-c) DESTDIR= PREFIX=/usr @@ -10,11 +12,13 @@ BINDIR=${PREFIX}/bin SBINDIR=${PREFIX}/sbin BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib/${PACKAGE} +SERVICEDIR=/lib/systemd/system VARLIBDIR=/var/lib/${PACKAGE} MANDIR=${PREFIX}/share/man DOCDIR=${PREFIX}/share/doc MAN1DIR=${MANDIR}/man1/ MAN5DIR=${MANDIR}/man5/ +MAN8DIR=${MANDIR}/man8/ BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/ export PERLDIR=${PREFIX}/share/perl5 PERLINCDIR=${PERLDIR}/asm-x86_64 @@ -23,6 +27,9 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GITVERSION:=$(shell git rev-parse HEAD) DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb +DBG_DEB=${PACKAGE}-dbgsym_${VERSION}-${PKGREL}_${ARCH}.deb + +DEBS=${DEB} ${DBG_DEB} # this requires package pve-doc-generator export NOVIEW=1 @@ -36,6 +43,9 @@ all: dinstall: deb dpkg -i ${DEB} +qmeventd: qmeventd.c + $(CC) $(CFLAGS) ${JSON_CFLAGS} -o $@ $< ${JSON_LIBS} + qm.bash-completion: PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp mv $@.tmp $@ @@ -44,15 +54,17 @@ qmrestore.bash-completion: PVE_GENERATING_DOCS=1 perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp mv $@.tmp $@ -PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion +PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract qm.conf.5 qm.bash-completion qmrestore.bash-completion qmeventd qmeventd.8 .PHONY: install install: ${PKGSOURCES} install -d ${DESTDIR}/${SBINDIR} install -d ${DESTDIR}${LIBDIR} install -d ${DESTDIR}${VARLIBDIR} + install -d ${DESTDIR}${SERVICEDIR} install -d ${DESTDIR}/${MAN1DIR} install -d ${DESTDIR}/${MAN5DIR} + install -d ${DESTDIR}/${MAN8DIR} install -d ${DESTDIR}/usr/share/man/man5 install -d ${DESTDIR}/usr/share/${PACKAGE} install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/${PACKAGE} @@ -63,6 +75,8 @@ install: ${PKGSOURCES} make -C PVE install install -m 0755 qm ${DESTDIR}${SBINDIR} install -m 0755 qmrestore ${DESTDIR}${SBINDIR} + install -m 0755 qmeventd ${DESTDIR}${SBINDIR} + install -m 0644 qmeventd.service ${DESTDIR}${SERVICEDIR} install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge install -m 0755 pve-bridge-hotplug ${DESTDIR}${VARLIBDIR}/pve-bridge-hotplug install -m 0755 pve-bridgedown ${DESTDIR}${VARLIBDIR}/pve-bridgedown @@ -70,6 +84,8 @@ install: ${PKGSOURCES} install -m 0755 qmextract ${DESTDIR}${LIBDIR} install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR} gzip -9 -n -f ${DESTDIR}/${MAN1DIR}/qm.1 + install -m 0644 qmeventd.8 ${DESTDIR}/${MAN8DIR} + gzip -9 -n -f ${DESTDIR}/${MAN8DIR}/qmeventd.8 install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR} gzip -9 -n -f ${DESTDIR}/${MAN1DIR}/qmrestore.1 install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR} @@ -77,13 +93,14 @@ install: ${PKGSOURCES} cd ${DESTDIR}/${MAN5DIR}; ln -s -f qm.conf.5.gz vm.conf.5.gz .PHONY: deb -deb: ${DEB} +deb: ${DEBS} +${DBG_DEB}: ${DEB} ${DEB}: rm -rf build rsync -a * build echo "git clone git://git.proxmox.com/git/qemu-server.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE cd build; dpkg-buildpackage -b -us -uc - lintian ${DEB} + lintian ${DEBS} .PHONY: test test: @@ -92,12 +109,12 @@ test: .PHONY: upload upload: ${DEB} - tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch + tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist stretch .PHONY: clean clean: make cleanup-docgen - rm -rf build *.deb *.buildinfo *.changes + rm -rf build *.deb *.buildinfo *.changes qmeventd find . -name '*~' -exec rm {} ';'